diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 7907d68f45030445bb7bef6d53bfc334b69e1876..9a944efa6834e61b77582654a4cb4fd768a319db 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -36,12 +36,16 @@ set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
 set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
-set (OPENAIR3_DIR   ${OPENAIR_DIR}/openair3)
+set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
 set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
 
 project (OpenAirInterface)
 
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m lms7002m)
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR lmsSDR)
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C Si5351C)
+
 ###########################################
 # macros to define options as there is numerous options in oai
 ################################################
@@ -159,14 +163,20 @@ set(CMAKE_C_FLAGS
   "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP"
 )
 set(CMAKE_CXX_FLAGS
-  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR}"
+  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 "
 )
+
+
+#########################
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${OPENAIR_TARGETS}/bin")
+#########################
 # set a flag for changes in the source code
 # 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") 
 
+Message("RF_BOARD is ${RF_BOARD}")
 # Below has been put in comment because does not work with
 # SVN authentication.
 #
@@ -244,6 +254,9 @@ endif (${RTAI})
 set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
 set(asn1_generated_dir ${OPENAIR_BIN_DIR})
 
+set(protoc_call "${OPENAIR_CMAKE}/tools/generate_protobuf")
+set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
+
 # RRC
 ######
 add_list2_option(RRC_ASN1_VERSION "Rel10" "ASN.1 version of RRC interface" "Rel8" "Rel10" "CBA")
@@ -404,8 +417,55 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
 add_list1_option(NB_ANTENNAS_TX "2" "Number of antennas in transmission" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TXRX "2" "Number of antennas in ????" "1" "2" "4")
 
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "False" "EXMIMO" "OAI_USRP" "ETHERNET" "OAI_BLADERF" "CPRIGW")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
+
+add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
+
+
+# include RF devices / transport protocols library modules
+######################################################################
+
+include_directories("${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/")
+include_directories ("${OPENAIR_TARGETS}/ARCH/EXMIMO/DEFS/")
+#set (option_HWEXMIMOLIB_lib "-l ")
+set(HWLIB_EXMIMO_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
+  ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c
+  )
+add_library(oai_exmimodevif MODULE ${HWLIB_EXMIMO_SOURCE} )
+
+include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
+set (option_HWUSRPLIB_lib "-l uhd")
+set(HWLIB_USRP_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+  )
+add_library(oai_usrpdevif MODULE ${HWLIB_USRP_SOURCE} )
+
+include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
+set (option_HWBLADERFLIB_lib "-l bladerf")
+set(HWLIB_BLADERF_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+  )
+add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
 
+include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
+set (option_HWLMSSDRLIB_lib "-l LMS_SDR -l LMS7002M -l Si5351C")
+set(HWLIB_LMSSDR_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+  )
+add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
+
+include_directories("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/")
+set(TPLIB_ETHERNET_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+  )
+add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )
+
+
+# RF devices / transport protocols settings
+######################################################################
 if (${RF_BOARD} STREQUAL "EXMIMO")
   set(DRIVER2013)
   include_directories ("${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/")
@@ -413,6 +473,7 @@ if (${RF_BOARD} STREQUAL "EXMIMO")
   set(HW_SOURCE ${HW_SOURCE}
     ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
     ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c)
+  set(option_HW_lib "-rdynamic -ldl")
 
 elseif (${RF_BOARD} STREQUAL "OAI_USRP")
   include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
@@ -420,8 +481,7 @@ elseif (${RF_BOARD} STREQUAL "OAI_USRP")
   set(HW_SOURCE ${HW_SOURCE}
     ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp)
   LINK_DIRECTORIES("/opt/lib")
-  set(option_HW_lib "uhd")
-  #set(LOWLATENCY False)
+  set(option_HW_lib "-luhd -rdynamic -ldl")
 
 elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
   include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
@@ -431,24 +491,48 @@ elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
     ${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
     )
   LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
-  set(option_HW_lib "bladeRF")
+
+  set(option_HW_lib "bladeRF -rdynamic -ldl")
  #set(LOWLATENCY False)
 
-elseif (${RF_BOARD} STREQUAL "ETHERNET")
-  include_directories ("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB")
-  set(HW_SOURCE ${HW_SOURCE}
-    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
-    )
-  #set(LOWLATENCY True)
-  
+elseif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard")
+  LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lmsSDR")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lms7002m")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/Si5351C")
+  set(HW_SOURCE ${HW_SOURCE} ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp)
+  set(LOWLATENCY False)
+  set(option_HW_lib "-lLMS_SDR -lLMS7002M -lSi5351C -rdynamic -ldl")
+
 elseif (${RF_BOARD} STREQUAL "CPRIGW")
   set(HW_SOURCE ${HW_SOURCE}
     ${OPENAIR_TARGETS}/ARCH/CPRIGW/USERSPACE/LIB/cprigw_lib.c
     )
   include_directories("${OPENAIR_TARGETS}/ARCH/CPRIGW/USERSPACE/LIB/")
-   set(option_HW_lib "-rdynamic dl")
+  set(option_HW_lib "-rdynamic dl")
+  
 endif (${RF_BOARD} STREQUAL "EXMIMO")
 
+
+if (${TRANSP_PRO} STREQUAL "ETHERNET")
+  
+  include_directories ("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB")
+  set(TRANSPORT_SOURCE ${TRANSPORT_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+    )
+  set(option_TP_lib "-rdynamic -ldl")
+
+  
+endif (${TRANSP_PRO} STREQUAL "ETHERNET")
+##########################################################
+
 include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
 
 Message("LOWLATENCY flag  is ${LOWLATENCY}")
@@ -474,6 +558,9 @@ add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
 add_boolean_option(MESSAGE_CHART_GENERATOR False         "For generating sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
+
+add_boolean_option(ENB_AGENT                   True         "enable eNB agent to inteface with a SDN contrller")
+
 ########################
 # Include order
 ##########################
@@ -1403,10 +1490,11 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
 
 #################################
 # add executables for operation
-#################################""
+#################################
 
 # lte-softmodem is both eNB and UE implementation
 ###################################################
+
 add_executable(lte-softmodem
   ${rrc_h}
   ${s1ap_h}
@@ -1424,6 +1512,7 @@ add_executable(lte-softmodem
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${GTPU_need_ITTI}
   ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${RTAI_SOURCE}
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
@@ -1431,13 +1520,14 @@ add_executable(lte-softmodem
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} 
   -Wl,--end-group )
 
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${XFORMS_LIBRARIES} )
+target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ) 
 target_link_libraries (lte-softmodem ${LIBBOOST_LIBRARIES})
+target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
 
 # lte-softmodem-nos1 is both eNB and UE implementation
 ###################################################
@@ -1458,6 +1548,7 @@ add_executable(lte-softmodem-nos1
   #${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${RTAI_SOURCE}
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
@@ -1468,38 +1559,43 @@ target_link_libraries (lte-softmodem-nos1
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib} ${XFORMS_LIBRARIES} )
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib}  ${option_TP_lib} ${XFORMS_LIBRARIES} )
 target_link_libraries (lte-softmodem-nos1 ${LIBBOOST_LIBRARIES})
-
-
+target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 
 # rrh
 ################################
-set(DRIVER2013)
-
-#Note: only on RF type is currently supported for RRH
+#Note: only one RF type (USRP) is currently supported for RRH
 add_executable(rrh_gw
   ${OPENAIR_TARGETS}/RT/USER/rrh_gw.c
   ${OPENAIR_TARGETS}/RT/USER/eNB_transport_IQ.c
   ${OPENAIR_TARGETS}/RT/USER/UE_transport_IQ.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c		
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c 
   ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   )
-# assert and common_lib.h
-target_include_directories(rrh_gw PRIVATE  ${OPENAIR_DIR}/common/utils/itti ${OPENAIR_TARGETS}/ARCH/COMMON ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ )
-
+target_include_directories(rrh_gw PRIVATE  ${OPENAIR_DIR}/common/utils/itti)
 target_link_libraries(rrh_gw
   -Wl,--start-group
   UTIL LFDS  
   -Wl,--end-group )
 target_link_libraries (rrh_gw rt pthread m )
-target_link_libraries (rrh_gw ${option_HW_lib} ${LIBBOOST_LIBRARIES} )
+target_link_libraries (rrh_gw  ${option_HW_lib} ${option_TP_lib} ${LIBBOOST_LIBRARIES} )
+target_link_libraries (rrh_gw ${LIB_LMS_LIBRARIES})
 
-#Message("-- default_HW_lib=ETHERNET") # only in case of RRH
 Message("-- option_HW_lib=${option_HW_lib}")
 Message("-- HW_SOURCE=${HW_SOURCE}")
+Message("-- option_TP_lib=${option_TP_lib}")
+Message("-- TRANSPORT_SOURCE=${TRANSPORT_SOURCE}")
+
+if (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+  add_dependencies(lte-softmodem LMS7002M LMS_SDR Si5351C)
+  add_dependencies(lte-softmodem-nos1 LMS7002M LMS_SDR Si5351C)
+  add_dependencies(rrh_gw LMS7002M LMS_SDR Si5351C)
+endif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+
+
 
 # USIM process
 #################
@@ -1550,6 +1646,7 @@ add_executable(oaisim
   ${GTPU_need_ITTI}
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
   ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${XFORMS_SOURCE}
 )
 
@@ -1561,7 +1658,7 @@ target_link_libraries (oaisim
   -Wl,--end-group )
 
 target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
-target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES} sctp ${option_HW_lib}
+target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib}
   ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES})
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim forms)
@@ -1588,6 +1685,7 @@ add_executable(oaisim_nos1
   ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
   ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${XFORMS_SOURCE}
 )
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
@@ -1597,7 +1695,7 @@ target_link_libraries (oaisim_nos1
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
-target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib}
+target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib}  ${option_TP_lib}
   ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES})
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim_nos1 forms)
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index 03f10ce57880096d05724a702a4ba14afd43a9f8..037f5c8ee9bef643165ad7820dcc0d2f856a3a86 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -81,7 +81,8 @@
      <compile_prog_args>--eNB -w USRP -r Rel10 --noS1  -c </compile_prog_args>
      <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1
                        $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/rb_tool
-                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko</compile_prog_out>
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/liboai_usrpdevif.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -122,7 +123,8 @@
      <compile_prog_args>--eNB -w BLADERF -r Rel10 --noS1  -c </compile_prog_args>
      <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1
                        $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/rb_tool
-                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko</compile_prog_out>
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/liboai_bladerfdevif.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -138,10 +140,11 @@
      <desc>Build lte_softmodem_noS1.ETHERNET.Rel10</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-     <compile_prog_args>--eNB -w ETHERNET -r Rel10 --noS1  -c </compile_prog_args>
+     <compile_prog_args>--eNB -w None -t ETHERNET -r Rel10 --noS1  -c </compile_prog_args>
      <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1
                        $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/rb_tool
-                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko</compile_prog_out>
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko
+                       $OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/liboai_eth_transpro.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -160,7 +163,8 @@
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args>--eNB -w USRP -r Rel10   -c </compile_prog_args>
-     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</compile_prog_out>
+     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
+                       $OPENAIR_DIR/cmake_targets/lte_build_oai/build/liboai_usrpdevif.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -197,7 +201,8 @@
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args>--eNB -w BLADERF -r Rel10   -c </compile_prog_args>
-     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</compile_prog_out>
+     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
+                       $OPENAIR_DIR/cmake_targets/lte_build_oai/build/liboai_bladerfdevif.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -213,8 +218,9 @@
      <desc>Build lte_softmodem.ETHERNET.Rel10</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-     <compile_prog_args>--eNB -w ETHERNET -r Rel10   -c </compile_prog_args>
-     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</compile_prog_out>
+     <compile_prog_args>--eNB -w None -t ETHERNET -r Rel10   -c </compile_prog_args>
+     <compile_prog_out>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
+                       $OPENAIR_DIR/cmake_targets/lte_build_oai/build/liboai_eth_transpro.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -261,11 +267,13 @@
 
      <testCase id="010140" >
      <class>compilation</class>
-     <desc>Build RRH Gateway</desc>
+     <desc>Build RRH Gateway for USRP(RF) + Ethernet (Transport)</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-     <compile_prog_args>--RRH -w USRP  -c </compile_prog_args>
-     <compile_prog_out>$OPENAIR_DIR/cmake_targets/rrh_gw/build/rrh_gw</compile_prog_out>
+     <compile_prog_args>--RRH -w USRP -t ETHERNET  -c </compile_prog_args>
+     <compile_prog_out>$OPENAIR_DIR/cmake_targets/rrh_gw/build/rrh_gw
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_usrpdevif.so
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_eth_transpro.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -278,14 +286,16 @@
 
      <testCase id="010141" >
      <class>compilation</class>
-     <desc>Build RRH Gateway</desc>
+     <desc>Build RRH Gateway for EXMIMO(RF) + Ethernet (Transport)</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-     <compile_prog_args>--RRH -w EXMIMO  -c </compile_prog_args>
+     <compile_prog_args>--RRH -w EXMIMO -t ETHNERNET  -c </compile_prog_args>
      <compile_prog_out>$OPENAIR_DIR/cmake_targets/rrh_gw/build/rrh_gw
                        $OPENAIR_DIR/cmake_targets/rrh_gw/build/CMakeFiles/openair_rf/openair_rf.ko
                        $OPENAIR_DIR/cmake_targets/rrh_gw/build/updatefw
-                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/oarf_config_exmimo.oct</compile_prog_out>
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/oarf_config_exmimo.oct
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_exmimodevif.so
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_eth_transpro.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -301,8 +311,10 @@
      <desc>Build RRH Gateway</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-     <compile_prog_args>--RRH -w BLADERF  -c </compile_prog_args>
-     <compile_prog_out>$OPENAIR_DIR/cmake_targets/rrh_gw/build/rrh_gw</compile_prog_out>
+     <compile_prog_args>--RRH -w BLADERF -t ETHERNET  -c </compile_prog_args>
+     <compile_prog_out>$OPENAIR_DIR/cmake_targets/rrh_gw/build/rrh_gw
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_bladerfdevif.so
+                       $OPENAIR_DIR/cmake_targets/rrh_gw/build/liboai_eth_transpro.so</compile_prog_out>
      <pre_exec></pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -4622,7 +4634,7 @@
   <testCase id="016500" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -4639,17 +4651,17 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -29
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -26
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
@@ -4698,7 +4710,7 @@
   <testCase id="016501" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -4715,23 +4727,23 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower      -32
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -29
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
     <eNB_search_expr_true></eNB_search_expr_true>
     <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>True</eNB_terminate_missing_procs>
+    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
     <UE_working_dir>/tmp</UE_working_dir>
     <UE_config_file></UE_config_file>
@@ -4773,7 +4785,7 @@
   <testCase id="016502" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -4790,23 +4802,23 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower       -35
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -32
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
     <eNB_search_expr_true></eNB_search_expr_true>
     <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>True</eNB_terminate_missing_procs>
+    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
     <UE_working_dir>/tmp</UE_working_dir>
     <UE_config_file></UE_config_file>
@@ -4848,7 +4860,7 @@
   <testCase id="016503" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -4865,23 +4877,23 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower       -29
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -26
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
     <eNB_search_expr_true></eNB_search_expr_true>
     <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>True</eNB_terminate_missing_procs>
+    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
     <UE_working_dir>/tmp</UE_working_dir>
     <UE_config_file></UE_config_file>
@@ -4922,7 +4934,7 @@
   <testCase id="016504" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -4939,23 +4951,23 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower       -32
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -29
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
     <eNB_search_expr_true></eNB_search_expr_true>
     <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>True</eNB_terminate_missing_procs>
+    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
     <UE_working_dir>/tmp</UE_working_dir>
     <UE_config_file></UE_config_file>
@@ -4996,7 +5008,7 @@
   <testCase id="016505" >
     <class>lte-softmodem</class>
     <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>mozart</eNB>
     <UE>stevens</UE>
     <EPC>amerique</EPC>
     <TimeOut_cmd>390</TimeOut_cmd>
@@ -5013,23 +5025,23 @@
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  frame_type \"FDD\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_rx  1
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower       -35
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  pdsch_referenceSignalPower -32
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.111/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth0\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.111/24\"
                      targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
     <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
     <eNB_compile_prog_args>--eNB -w BLADERF -x -c </eNB_compile_prog_args>
     <eNB_pre_exec>sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py</eNB_pre_exec>
     <eNB_pre_exec_args></eNB_pre_exec_args>
-    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
+    <eNB_main_exec>sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
     <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf  -W </eNB_main_exec_args>
     <eNB_traffic_exec></eNB_traffic_exec>
     <eNB_traffic_exec_args></eNB_traffic_exec_args>
     <eNB_search_expr_true></eNB_search_expr_true>
     <eNB_search_expr_false></eNB_search_expr_false>
-    <eNB_terminate_missing_procs>True</eNB_terminate_missing_procs>
+    <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
 
     <UE_working_dir>/tmp</UE_working_dir>
     <UE_config_file></UE_config_file>
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index c723d8d6dc95e9acd0a24537d4b0d783e050fc9c..6300e9ec03760071fbee9ba3c33975d74a3c9417 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -49,13 +49,14 @@ LOWLATENCY_FLAG_USER="False"
 FORCE_LOWLATENCY_FLAG_USER=""
 REL="Rel10"
 HW="EXMIMO"
+TP="None"
 NOS1=0
 EPC=0
 VERBOSE_COMPILE=0
 CFLAGS_PROCESSOR_USER=""
 RUN_GROUP=0
 TEST_CASE_GROUP=""
-
+BUILD_DOXYGEN=0
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -90,10 +91,13 @@ Options
    default is Rel10,
    Rel8 limits the implementation to 3GPP Release 8 version
 -w | --hardware
-   EXMIMO (Default), USRP, BLADERF, ETHERNET, None
+   EXMIMO (Default), USRP, BLADERF, LMSSDR, None
    Adds this RF board support (in external packages installation and in compilation)
+-t | --transport protocol
+   ETHERNET , None
+   Adds this trasport protocol support in compilation
 --oaisim
-   Makes the oaisim simulator. Hardware will be defaulted to "NONE".
+   Makes the oaisim simulator. Hardware will be defaulted to "None".
 --phy_simulators
    Makes the unitary tests Layer 1 simulators
 --core_simulators
@@ -115,6 +119,8 @@ Options
    Shows detailed compilation instructions in makefile
 --cflags_processor
    Manually Add CFLAGS of processor if they are not detected correctly by script. Only add these flags if you know your processor supports them. Example flags: -msse3 -msse4.1 -msse4.2 -mavx2
+--build-doxygen
+   Builds doxygen based documentation.
 --disable-deadline
    Disables deadline scheduler of Linux kernel (>=3.14.x).
 --enable-deadline
@@ -170,20 +176,35 @@ function main() {
             shift;;
        -r | --3gpp-release)
             REL=$2
-            echo_info "setting release to: $REL"
+            echo_info "Setting release to: $REL"
             shift 2;;
        -w | --hardware)
             HW="$2" #"${i#*=}"
-            # Use OAI_USRP  as the key word USRP is used inside UHD driver
-            if [ "$HW" == "USRP" ] ; then 
-		HW="OAI_USRP"
-	    fi 
-            if [ "$HW" == "BLADERF" ] ; then 
-		HW="OAI_BLADERF"
-	    fi 
-            echo_info "setting hardware to: $HW"
+            # Use OAI_USRP  as the key word USRP is used inside UHD driver           
+	    if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO"  ] ; then 
+		echo_fatal "Unknown HW type $HW will exit..."		
+	    else
+		if [ "$HW" == "USRP" ] ; then 
+		    HW="OAI_USRP"
+		fi 
+		if [ "$HW" == "BLADERF" ] ; then 
+		    HW="OAI_BLADERF"
+		fi
+		if [ "$HW" == "LMSSDR" ] ; then 
+		    HW="OAI_LMSSDR"
+		fi 
+		echo_info "Setting hardware to: $HW"
+	    fi
+            shift 2;;
+	-t | --transport_protocol)
+            TP="$2" #"${i#*=}"
+	    if [ "$TP" != "ETHERNET" -a "$TP" != "None" ] ; then 
+		echo_fatal "Unknown TP type $TP will exit..."		
+	    else
+		echo_info "Setting transport protocol to: $TP"		
+	    fi
             shift 2;;
-       --oaisim)
+	--oaisim)
             oaisim=1
             echo_info "Will compile oaisim and drivers nasmesh, ..."
             shift;;
@@ -205,7 +226,7 @@ function main() {
             echo_info "executing test cases only in group: $TEST_CASE_GROUP"
             shift 2;;
        -V | --vcd)
-            echo_info "setting gtk-wave output"
+            echo_info "Setting gtk-wave output"
             VCD_TIMING=1
             EXE_ARGUMENTS="$EXE_ARGUMENTS -V"
             shift;;
@@ -228,8 +249,12 @@ function main() {
             shift;;
        --cflags_processor)
             CFLAGS_PROCESSOR_USER=$2
-            echo_info "setting CPU FLAGS from USER to: $CFLAGS_PROCESSOR_USER"
+            echo_info "Setting CPU FLAGS from USER to: $CFLAGS_PROCESSOR_USER"
             shift 2;;
+       --build-doxygen)
+	    BUILD_DOXYGEN=1
+            echo_info "Will build doxygen support"
+            shift;;     
        --disable-deadline)
             FORCE_LOWLATENCY_FLAG_USER="False"
             echo_info "Disabling the usage of deadline scheduler"
@@ -238,7 +263,6 @@ function main() {
             FORCE_LOWLATENCY_FLAG_USER="True"
             echo_info "Enabling the usage of deadline scheduler"
             shift 1;;
-
         -h | --help)
             print_help
             exit 1;;
@@ -248,7 +272,37 @@ function main() {
             break;;
    esac
   done
+  
+  #########################################################
+  # check validity of HW and TP parameters for RRH and eNB
+  #########################################################
+  # to be discussed
+  
+  if [ "$eNB" = "1" ] ; then
+      if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
+	  echo_fatal "Define a local radio head (e.g. -w EXMIMO) or a transport protocol (e.g. -t ETHERNET) to communicate with a remote radio head!"
+      fi
+      if [ "$HW" != "None" -a  "$TP" != "None" ] ; then
+	  echo_fatal "Currently eNB  can not support simultaniously local and remote radio heads!!"
+      fi      
+      if [ "$HW" = "None" ] ; then 
+	  echo_info "No radio head has been selected (HW set to $HW)"	
+      fi
+      if [ "$TP" = "None" ] ; then
+	  echo_info "No transport protocol has been selected (TP set to $TP)"	
+      fi
+  fi
+  
+  if [ "$RRH" = "1" ] ; then
+      if [ "$TP" = "None" ] ; then
+	  echo_fatal "A transport protocol (e.g. -t ETHERNET) must be defined!"
+      fi
+      if [ "$HW" = "None" ] ; then
+	  echo_info "No radio head has been selected (HW set to $HW)"	
+      fi
+  fi
 
+  echo_info "RF HW set to $HW" 
   #Now we set flags to enable deadline scheduler settings
   #By default: USRP: disable, 
   #By default: BLADERF: enable,
@@ -262,6 +316,8 @@ function main() {
         LOWLATENCY_FLAG_USER="False"
      elif [ "$HW" = "OAI_BLADERF" ] ; then 
         LOWLATENCY_FLAG_USER="False"
+     elif [ "$HW" = "OAI_LMSSDR" ] ; then 
+        LOWLATENCY_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
         LOWLATENCY_FLAG_USER="False"
      else 
@@ -274,6 +330,7 @@ function main() {
 
   echo_info "Flags for Deadline scheduler: $LOWLATENCY_FLAG_USER"
 
+
   ############################################
   # setting and printing OAI envs, we should check here
   ############################################
@@ -312,7 +369,7 @@ function main() {
       check_install_usrp_uhd_driver
     fi 
     if [ "$HW" == "OAI_BLADERF" ] ; then
-      echo_info "installing packages for BALDERF support"
+      echo_info "installing packages for BLADERF support"
       check_install_bladerf_driver
     fi
   fi
@@ -323,9 +380,11 @@ function main() {
   fi
 
   if [ "$oaisim" = "1" ] ; then
-      if [ "$HW" != "ETHERNET" ] ; then 
-	  HW="NONE"
-      fi 
+      #to be discussed
+      # there is no RF device and no transport protocol 
+      HW="None" 
+      TP="None"
+      
       if [ "$XFORMS" == "True" ] ; then 
 	  PRINT_STATS="True"
       fi 
@@ -359,7 +418,8 @@ function main() {
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
     echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
-    echo "set(PACKAGE_NAME \"${lte_exec}\")"     >>  $cmake_file
+    echo "set ( TRANSP_PRO \"${TP}\")"             >>  $cmake_file
+    echo "set(PACKAGE_NAME \"${lte_exec}\")"       >>  $cmake_file
     echo "set (LOWLATENCY \"${LOWLATENCY_FLAG_USER}\" )"    >>$cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
@@ -565,33 +625,124 @@ function main() {
   fi
 
   # RRH compilation
-  ##################
+  #####################
   if [ "$RRH" = "1" ] ; then
-    echo_info "Compiling RRH"
-    if [  $HW == "ETHERNET" ] ; then 
-	echo_info "RF frontend for RRH is not defined. This mode is used for testing (loopback)."
-    elif [ $HW != "EXMIMO" -a $HW != "OAI_USRP" -a $HW != "OAI_BLADERF" ] ; then 
-	echo_fatal "Hardware not defined ($HW)"
-    fi
-    cmake_file=$DIR/rrh_gw/CMakeLists.txt
-    echo "cmake_minimum_required(VERSION 2.8)"   >   $cmake_file
-    echo "set(ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
-    echo "set(ENABLE_ITTI False )"     					 >>  $cmake_file
-    echo "set(RF_BOARD \"${HW}\")"               >>  $cmake_file
-    echo 'set(PACKAGE_NAME "\"rrh_gw\"")' >>  $cmake_file
-    echo "set(LOWLATENCY \"${LOWLATENCY_FLAG_USER}\")"    >>$cmake_file
-    echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
 
-    [ "$CLEAN" = "1" ] && rm -rf $DIR/rrh_gw/build
-    mkdir -p $DIR/rrh_gw/build
-    cd $DIR/rrh_gw/build
+     rrh_exec=rrh_gw
+     rrh_build_dir=rrh_gw
+     
+     echo_info "Compiling $rrh_exec ..."
+    
+     [ "$CLEAN" = "1" ] && rm -rf $DIR/rrh_gw/build 
+     mkdir -p $DIR/$rrh_build_dir/build
+     cmake_file=$DIR/$rrh_build_dir/CMakeLists.txt
+     echo "cmake_minimum_required(VERSION 2.8)"   >   $cmake_file
+     echo "set(ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
+     echo "set(ENABLE_ITTI False )"     		 >>  $cmake_file
+     echo "set(RF_BOARD \"${HW}\")"               >>  $cmake_file
+     echo "set(TRANSP_PRO \"${TP}\")"             >>  $cmake_file
+     echo 'set(PACKAGE_NAME "\"rrh_gw\"")'        >>  $cmake_file
+     echo "set (LOWLATENCY \"${LOWLATENCY_FLAG_USER}\" )"    >>$cmake_file
+     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file    
+     cd $DIR/$rrh_build_dir/build
+     cmake ..
+     compilations \
+	 rrh_gw rrh_gw \
+	 rrh_gw $dbin/rrh_gw
+
+  fi
+  
+  # build RF device and transport protocol libraries
+  #####################################
+  if [ "$eNB" = "1" -o  "$RRH" = "1" ] ; then
+
+      if [ "$eNB" = "1" ] ; then
+	  build_dir=$lte_build_dir	  
+      else
+	  build_dir=$rrh_build_dir	 
+      fi
+
+      # build RF device libraries (currently EXMIMO is not complied with the rest of HW targets)
+      if [ "$HW" != "None" ] ; then
+	  rm -f liboai_device.so
+	  rm -f $dbin/liboai_device.so
+
+
+	  # link liboai_device.so with the selected RF device library
+	  if [ "$HW" == "EXMIMO" ] ; then
+	      
+	      #add exmimo compilation
+	      #TODO EXMIMO library support
+	     
+	      echo_info "liboai_device.so is linked to EXMIMO device library"       
+	  elif [ "$HW" == "OAI_USRP" ] ; then
+	      if [ -d "/usr/include/uhd" ] ; then
+		  compilations \
+		      $build_dir oai_usrpdevif \
+		      liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+	      fi
+
+	      ln -s liboai_usrpdevif.so liboai_device.so
+	      ln -s $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to USRP device library"        
+	  elif [ "$HW" == "OAI_BLADERF" ] ; then
+	      if [ -f "/usr/include/libbladeRF.h" ] ; then
+		  compilations \
+		      $build_dir oai_bladerfdevif \
+		      liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
+	      fi
+
+	      ln -s liboai_bladerfdevif.so liboai_device.so
+	      ln -s $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to BLADERF device library"	 
+	  elif [ "$HW" == "OAI_LMSSDR" ] ; then
+#	      if [ -f "/usr/include/libbladeRF.h" ] ; then
+		  compilations \
+		      $build_dir oai_lmssdrdevif \
+		      liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
+#	      fi
+
+	      ln -s liboai_lmssdrdevif.so liboai_device.so
+	      ln -s $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to LMSSDR device library"	 
+	  else 
+	      echo_info "liboai_device.so is not linked to any device library"	    
+	  fi
+      fi
+      
+      # build trasport protocol libraries (currently only ETHERNET is available)
+      if [ "$TP" != "None" ] ; then
+	  rm -f liboai_transpro.so
+	  rm -f $dbin/liboai_transpro.so
+
+	  if [ "$TP" == "ETHERNET" ] ; then
+	      compilations \
+		  $build_dir oai_eth_transpro \
+		  liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
+	      ln -s liboai_eth_transpro.so liboai_transpro.so
+	      ln -s $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
+	      echo_info "liboai_transpro.so is linked with ETHERNET library"	 
+	  fi      
+      fi
+fi
+
+
+  # Doxygen Support
+  #####################
+  if [ "$BUILD_DOXYGEN" = "1" ] ;then
+    doxygen_log=$OPENAIR_DIR/cmake_targets/log/doxygen.log
+    echo_info "Building doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/targets/DOCS/html/index.html"
+    echo_info "Doxygen Generation log is located here: $doxygen_log"
+    echo_info "Generating doxygen files....please wait"
+    (
+    [ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
+    mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
+    cd $OPENAIR_DIR/cmake_targets/doxygen/build
     cmake ..
-    compilations \
-      rrh_gw rrh_gw \
-      rrh_gw $dbin/rrh_gw
+    make doc
+    ) >& $doxygen_log
   fi
 
-  
   # Auto-tests
   #####################
   if [ "$OAI_TEST" = "1" ]; then
diff --git a/cmake_targets/rrh_gw/CMakeLists.txt b/cmake_targets/rrh_gw/CMakeLists.txt
deleted file mode 100644
index 9ff1437f0c58db559a3a9386489a18cc1e2a596e..0000000000000000000000000000000000000000
--- a/cmake_targets/rrh_gw/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-set(ENABLE_VCD_FIFO False )
-set(ENABLE_ITTI False )
-set(RF_BOARD "ETHERNET")
-set(PACKAGE_NAME "\"rrh_gw\"")
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 496096e9727218981330afbf5c89953996111325..c8adf452571e9194b9e6ed5b060561d70738fc81 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -180,7 +180,7 @@ check_install_bladerf_driver(){
 	$SUDO apt-get install -y bladerf libbladerf-dev
 	$SUDO apt-get install -y bladerf-firmware-fx3
 	$SUDO apt-get install -y bladerf-fpga-hostedx40	
-	bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img	
+	$SUDO bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img	
 }
 
 check_install_additional_tools (){
@@ -380,3 +380,21 @@ done
 }
 
 
+# get from http://www.linuxjournal.com/content/validating-ip-address-bash-script
+validate_ip() {
+
+local  ip=$1
+local  stat=1
+
+if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+    OIFS=$IFS
+    IFS='.'
+    ip=($ip)
+    IFS=$OIFS
+    [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+        && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+    stat=$?
+fi
+
+return $stat
+}
\ No newline at end of file
diff --git a/openair1/PHY/LTE_REFSIG/primary_synch.h b/openair1/PHY/LTE_REFSIG/primary_synch.h
index f9cf6fc171d156cf197be85d54debc479d66abd1..717f2e552cab59313b7c02b7ef4347070f4667b6 100644
--- a/openair1/PHY/LTE_REFSIG/primary_synch.h
+++ b/openair1/PHY/LTE_REFSIG/primary_synch.h
@@ -1,31 +1,3 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
 short primary_synch0[144] = {0,0,0,0,0,0,0,0,0,0,32767,0,-26120,-19785,11971,-30502,-24020,-22288,32117,6492,31311,9658,-16384,-28378,25100,-21063,-7292,-31946,20429,25618,14948,29158,11971,-30502,31311,9658,25100,-21063,-16384,28377,-24020,22287,32117,6492,-7292,31945,20429,25618,-26120,-19785,-16384,-28378,-16384,28377,-26120,-19785,-32402,4883,31311,-9659,32117,6492,-7292,-31946,32767,-1,25100,-21063,-24020,22287,-32402,4883,-32402,4883,-24020,22287,25100,-21063,32767,-1,-7292,-31946,32117,6492,31311,-9659,-32402,4883,-26120,-19785,-16384,28377,-16384,-28378,-26120,-19785,20429,25618,-7292,31945,32117,6492,-24020,22287,-16384,28377,25100,-21063,31311,9658,11971,-30502,14948,29158,20429,25618,-7292,-31946,25100,-21063,-16384,-28378,31311,9658,32117,6492,-24020,-22288,11971,-30502,-26120,-19785,32767,0,0,0,0,0,0,0,0,0,0,0};
 short primary_synch1[144] = {0,0,0,0,0,0,0,0,0,0,32767,0,-31754,-8086,-24020,-22288,2448,32675,-26120,19784,27073,18458,-16384,28377,25100,21062,-29523,14217,-7292,31945,-13477,-29868,-24020,-22288,27073,18458,25100,21062,-16384,-28378,2448,-32676,-26120,19784,-29523,-14218,-7292,31945,-31754,-8086,-16384,28377,-16384,-28378,-31754,-8086,31311,-9659,27073,-18459,-26120,19784,-29523,14217,32767,-1,25100,21062,2448,-32676,31311,-9659,31311,-9659,2448,-32676,25100,21062,32767,0,-29523,14217,-26120,19784,27073,-18459,31311,-9659,-31754,-8086,-16384,-28378,-16384,28377,-31754,-8086,-7292,31945,-29523,-14218,-26120,19784,2448,-32676,-16384,-28378,25100,21062,27073,18458,-24020,-22288,-13477,-29868,-7292,31945,-29523,14217,25100,21062,-16384,28377,27073,18458,-26120,19784,2448,32675,-24020,-22288,-31754,-8086,32767,0,0,0,0,0,0,0,0,0,0,0};
 short primary_synch2[144] = {0,0,0,0,0,0,0,0,0,0,32767,0,-31754,8085,-24020,22287,2448,-32676,-26120,-19785,27073,-18459,-16384,-28378,25100,-21063,-29523,-14218,-7292,-31946,-13477,29867,-24020,22287,27073,-18459,25100,-21063,-16384,28377,2448,32675,-26120,-19785,-29523,14217,-7292,-31946,-31754,8085,-16384,-28378,-16384,28377,-31754,8085,31311,9658,27073,18458,-26120,-19785,-29523,-14218,32767,0,25100,-21063,2448,32675,31311,9658,31311,9658,2448,32675,25100,-21063,32767,0,-29523,-14218,-26120,-19785,27073,18458,31311,9658,-31754,8085,-16384,28377,-16384,-28378,-31754,8085,-7292,-31946,-29523,14217,-26120,-19785,2448,32675,-16384,28377,25100,-21063,27073,-18459,-24020,22287,-13477,29867,-7292,-31946,-29523,-14218,25100,-21063,-16384,-28378,27073,-18459,-26120,-19785,2448,-32676,-24020,22287,-31754,8085,32767,-1,0,0,0,0,0,0,0,0,0,0};
diff --git a/openair1/PHY/LTE_TRANSPORT/initial_sync.c b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
index 5c6b479b2003c6a8ca40938bd0e4be7fe9e0f5b0..b8be6305de316644fca26f37cded42365a0d2e2e 100644
--- a/openair1/PHY/LTE_TRANSPORT/initial_sync.c
+++ b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
@@ -48,7 +48,7 @@
 #include "gain_control.h"
 #endif
 
-#if defined(OAI_USRP) || defined(EXMIMO)
+#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_LMSSDR)
 #include "common_lib.h"
 extern openair0_config_t openair0_cfg[];
 #endif
@@ -291,17 +291,10 @@ int initial_sync(PHY_VARS_UE *phy_vars_ue, runmode_t mode)
   frame_parms->Ncp=NORMAL;
   frame_parms->frame_type=FDD;
   init_frame_parms(frame_parms,1);
-
-  //  write_output("rxdata0.m","rxd0",phy_vars_ue->lte_ue_common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);
-
-  /*#ifdef OAI_USRP
-  for (aarx = 0; aarx<frame_parms->nb_antennas_rx;aarx++) {
-    rxdata128 = (__m128i*)phy_vars_ue->lte_ue_common_vars.rxdata[aarx];
-    for (i=0; i<(frame_parms->samples_per_tti*10)>>2; i++) {
-      rxdata128[i] = _mm_srai_epi16(rxdata128[i],4);
-    } 
-  }
-  #endif*/
+  /*
+  write_output("rxdata0.m","rxd0",phy_vars_ue->lte_ue_common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);
+  exit(-1);
+  */
   sync_pos = lte_sync_time(phy_vars_ue->lte_ue_common_vars.rxdata,
                            frame_parms,
                            (int *)&phy_vars_ue->lte_ue_common_vars.eNb_id);
@@ -336,9 +329,11 @@ int initial_sync(PHY_VARS_UE *phy_vars_ue, runmode_t mode)
 
 #else
 #ifndef OAI_USRP
-  #ifndef OAI_BLADERF 
+#ifndef OAI_BLADERF
+#ifndef OAI_LMSSDR
   phy_adjust_gain(phy_vars_ue,0);
-  #endif
+#endif
+#endif
 #endif
 #endif
 
@@ -569,7 +564,7 @@ int initial_sync(PHY_VARS_UE *phy_vars_ue, runmode_t mode)
 	  phy_vars_ue->lte_frame_parms.phich_config_common.phich_duration,
 	  phich_string[phy_vars_ue->lte_frame_parms.phich_config_common.phich_resource],
 	  phy_vars_ue->lte_frame_parms.nb_antennas_tx_eNB);
-#if defined(OAI_USRP) || defined(EXMIMO)
+#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_LMSSDR)
     LOG_I(PHY,"[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n",
 	  phy_vars_ue->Mod_id,
 	  phy_vars_ue->frame_rx,
diff --git a/openair1/PHY/LTE_TRANSPORT/print_stats.c b/openair1/PHY/LTE_TRANSPORT/print_stats.c
index 54c32cdca69088aae5adaad1c3351255b0ab3114..4a953e71e0445e00d616dea09332e72fcd279da3 100644
--- a/openair1/PHY/LTE_TRANSPORT/print_stats.c
+++ b/openair1/PHY/LTE_TRANSPORT/print_stats.c
@@ -50,7 +50,7 @@
 #endif
 
 extern int mac_get_rrc_status(uint8_t Mod_id,uint8_t eNB_flag,uint8_t index);
-#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF)
+#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
 #include "common_lib.h"
 extern openair0_config_t openair0_cfg[];
 #endif
@@ -97,10 +97,10 @@ int dump_ue_stats(PHY_VARS_UE *phy_vars_ue, char* buffer, int length, runmode_t
 #ifdef EXMIMO
     len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB (LNA %d, vga %d dB)\n",phy_vars_ue->rx_total_gain_dB, openair0_cfg[0].rxg_mode[0],(int)openair0_cfg[0].rx_gain[0]);
 #endif
-#if defined(OAI_USRP) || defined(OAI_BLADERF)
+#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
     len += sprintf(&buffer[len], "[UE PROC] RX Gain %d dB\n",phy_vars_ue->rx_total_gain_dB);
 #endif
-#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
     len += sprintf(&buffer[len], "[UE_PROC] Frequency offset %d Hz (%d), estimated carrier frequency %f Hz\n",phy_vars_ue->lte_ue_common_vars.freq_offset,openair_daq_vars.freq_offset,openair0_cfg[0].rx_freq[0]-phy_vars_ue->lte_ue_common_vars.freq_offset);
 #endif
     len += sprintf(&buffer[len], "[UE PROC] UE mode = %s (%d)\n",mode_string[phy_vars_ue->UE_mode[0]],phy_vars_ue->UE_mode[0]);
diff --git a/openair1/PHY/TOOLS/lte_phy_scope.c b/openair1/PHY/TOOLS/lte_phy_scope.c
index e507024c86035785867ba5f7ad8984b3ff770bd2..843a77fe62a3a060c816c6e009e9699a71700045 100644
--- a/openair1/PHY/TOOLS/lte_phy_scope.c
+++ b/openair1/PHY/TOOLS/lte_phy_scope.c
@@ -88,7 +88,7 @@ FD_lte_phy_scope_enb *create_lte_phy_scope_enb( void )
   fl_set_object_boxtype( fdui->rxsig_t, FL_EMBOSSED_BOX );
   fl_set_object_color( fdui->rxsig_t, FL_BLACK, FL_RED );
   fl_set_object_lcolor( fdui->rxsig_t, FL_WHITE ); // Label color
-  fl_set_xyplot_ybounds(fdui->rxsig_t,30,70);
+  fl_set_xyplot_ybounds(fdui->rxsig_t,10,70);
 
   // Time-domain channel response
   fdui->chest_t = fl_add_xyplot( FL_NORMAL_XYPLOT, 410, 20, 370, 100, "Channel Impulse Response (samples, abs)" );
@@ -396,7 +396,7 @@ FD_lte_phy_scope_ue *create_lte_phy_scope_ue( void )
   fl_set_object_boxtype( fdui->rxsig_t, FL_EMBOSSED_BOX );
   fl_set_object_color( fdui->rxsig_t, FL_BLACK, FL_RED );
   fl_set_object_lcolor( fdui->rxsig_t, FL_WHITE ); // Label color
-  fl_set_xyplot_ybounds(fdui->rxsig_t,30,70);
+  fl_set_xyplot_ybounds(fdui->rxsig_t,10,70);
 
   // Time-domain channel response
   fdui->chest_t = fl_add_xyplot( FL_NORMAL_XYPLOT, 410, 20, 370, 100, "Channel Impulse Response (samples, abs)" );
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index dc0b79e4714f65bb8a8b66e325e56e2cb287b684..f308c0500aca2bd6908625c9a63cee6947a21b1c 100755
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -76,6 +76,13 @@
 #define openair_free(y,x) free((y))
 #define PAGE_SIZE 4096
 
+//#ifdef SHRLIBDEV
+//extern int rxrescale;
+//#define RX_IQRESCALELEN rxrescale
+//#else
+//#define RX_IQRESCALELEN 15
+//#endif
+
 //! \brief Allocate \c size bytes of memory on the heap with alignment 16 and zero it afterwards.
 //! If no more memory is available, this function will terminate the program with an assertion error.
 static inline void* malloc16_clear( size_t size )
diff --git a/openair1/PHY/impl_defs_top.h b/openair1/PHY/impl_defs_top.h
index 4b0edcff29720e0a530a4e9c3eab7c1cd54adc97..388687e97bd3af23f20719ed121a822652cfbd1a 100755
--- a/openair1/PHY/impl_defs_top.h
+++ b/openair1/PHY/impl_defs_top.h
@@ -44,7 +44,14 @@
 /** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation
  * @{
 
- * @defgroup _PHY_RF_INTERFACE_ Generic PHY - RF Interface
+ * @defgroup _PHY_RF_INTERFACE_ PHY - RF Interface
+ * @ingroup _PHY_RF_INTERFACE_
+ * @{
+ * @defgroup _GENERIC_PHY_RF_INTERFACE_ Generic PHY - RF Interface
+ * @defgroup _USRP_PHY_RF_INTERFACE_    PHY - USRP RF Interface
+ * @defgroup _BLADERF_PHY_RF_INTERFACE_    PHY - BLADERF RF Interface
+ * @}
+ *
  * @ingroup _ref_implementation_
  * @{
  * This module is responsible for defining the generic interface between PHY and RF Target
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index ef93068fb45d3563f3248212a106e433bd386fbd..985cda147fc68774944dbae4680934701760d1a0 100755
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -121,7 +121,7 @@ extern int rx_sig_fifo;
 #endif
 
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
 extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
 #endif
 
@@ -197,7 +197,7 @@ void dump_dlsch_SI(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe)
   exit(-1);
 }
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
 //unsigned int gain_table[31] = {100,112,126,141,158,178,200,224,251,282,316,359,398,447,501,562,631,708,794,891,1000,1122,1258,1412,1585,1778,1995,2239,2512,2818,3162};
 /*
 unsigned int get_tx_amp_prach(int power_dBm, int power_max_dBm, int N_RB_UL)
@@ -669,7 +669,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
   uint8_t ack_status=0;
   int8_t Po_PUCCH;
   int32_t ulsch_start=0;
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
   int overflow=0;
   int k,l;
 #endif
@@ -969,7 +969,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
 #endif
           phy_vars_ue->tx_total_RE = nb_rb*12;
 	  
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
 	  tx_amp = get_tx_amp(phy_vars_ue->tx_power_dBm,
 			      phy_vars_ue->tx_power_max_dBm,
 			      phy_vars_ue->lte_frame_parms.N_RB_UL,
@@ -1065,7 +1065,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
 #endif
           phy_vars_ue->tx_total_RE = 12;
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
 	  tx_amp = get_tx_amp(Po_PUCCH,
 			      phy_vars_ue->tx_power_max_dBm,
 			      phy_vars_ue->lte_frame_parms.N_RB_UL,
@@ -1128,7 +1128,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
 #endif
           phy_vars_ue->tx_total_RE = 12;
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
           tx_amp =  get_tx_amp(Po_PUCCH,
 	                       phy_vars_ue->tx_power_max_dBm,
 	                       phy_vars_ue->lte_frame_parms.N_RB_UL,
@@ -1230,7 +1230,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
       if (abstraction_flag == 0) {
         nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
 
-#if defined(EXMIMO) || defined(OAI_USRP) //this is the EXPRESS MIMO case
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)//this is the EXPRESS MIMO case
         ulsch_start = (phy_vars_ue->rx_offset+subframe_tx*frame_parms->samples_per_tti-
                        openair_daq_vars.timing_advance-
                        phy_vars_ue->timing_advance-
@@ -1257,7 +1257,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
           for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
             if (frame_parms->Ncp == 1)
               PHY_ofdm_mod(&phy_vars_ue->lte_ue_common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
                            dummy_tx_buffer,
 #else
                            &phy_vars_ue->lte_ue_common_vars.txdata[aa][ulsch_start],
@@ -1268,7 +1268,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
                            CYCLIC_PREFIX);
             else
               normal_prefix_mod(&phy_vars_ue->lte_ue_common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
                                 dummy_tx_buffer,
 #else
                                 &phy_vars_ue->lte_ue_common_vars.txdata[aa][ulsch_start],
@@ -1289,7 +1289,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
               }
             */
 #ifndef OFDMA_ULSCH
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
             apply_7_5_kHz(phy_vars_ue,dummy_tx_buffer,0);
             apply_7_5_kHz(phy_vars_ue,dummy_tx_buffer,1);
 #else
@@ -1304,7 +1304,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
             */
 #endif
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
             overflow = ulsch_start - 9*frame_parms->samples_per_tti;
 
             //if ((slot_tx==4) && (aa==0)) printf("ulsch_start %d, overflow %d\n",ulsch_start,overflow);
@@ -1404,7 +1404,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
 
             phy_vars_ue->tx_total_RE = 96;
 
-#if defined(EXMIMO) || defined(OAI_USRP)
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
             phy_vars_ue->lte_ue_prach_vars[eNB_id]->amp = get_tx_amp(phy_vars_ue->tx_power_dBm,
 								     phy_vars_ue->tx_power_max_dBm,
 								     phy_vars_ue->lte_frame_parms.N_RB_UL,
@@ -1553,9 +1553,11 @@ void lte_ue_measurement_procedures(uint16_t l, PHY_VARS_UE *phy_vars_ue,uint8_t
 
 #else
 #ifndef OAI_USRP
-  #ifndef OAI_BLADERF
+#ifndef OAI_BLADERF
+#ifndef OAI_LMSSDR
     phy_adjust_gain (phy_vars_ue,0);
-  #endif
+#endif
+#endif
 #endif
 #endif
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_OUT);
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index fbb88bf052773478cd9b1366f0705cb6889c01c1..2c3d0848c2e90a5e19f63588d4ad2ffc85e8d995 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -656,7 +656,17 @@ int main(int argc, char **argv)
     printf("dual_stream_UE=%d\n", dual_stream_UE);
   }
 
-  lte_param_init(n_tx,n_rx,transmission_mode,extended_prefix_flag,frame_type,Nid_cell,tdd_config,N_RB_DL,threequarter_fs,osf,perfect_ce);
+  lte_param_init(n_tx,
+		 n_rx,
+		 transmission_mode,
+		 extended_prefix_flag,
+		 frame_type,
+		 Nid_cell,
+		 tdd_config,
+		 N_RB_DL,
+		 threequarter_fs,
+		 osf,
+		 perfect_ce);
 
 
     
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index a72f2ad6c5716a4d59b36d1a4d4ee2544774db74..463c74c123b39cf428201d4a5c16be6d05f2308e 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -194,6 +194,7 @@ int main(int argc, char **argv)
   int nb_rb_set = 0;
   int sf;
 
+  int threequarter_fs=0;
   opp_enabled=1; // to enable the time meas
 
   cpu_freq_GHz = (double)get_cpu_freq_GHz();
@@ -203,7 +204,7 @@ int main(int argc, char **argv)
 
   logInit();
 
-  while ((c = getopt (argc, argv, "hapZbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:L")) != -1) {
+  while ((c = getopt (argc, argv, "hapZEbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:L")) != -1) {
     switch (c) {
     case 'a':
       channel_model = AWGN;
@@ -373,6 +374,10 @@ int main(int argc, char **argv)
       cyclic_shift = atoi(optarg);
       break;
 
+    case 'E':
+      threequarter_fs=1;
+      break;
+
     case 'N':
       N0 = atoi(optarg);
       break;
@@ -470,6 +475,7 @@ int main(int argc, char **argv)
 		 0,
 		 tdd_config,
 		 N_RB_DL,
+		 threequarter_fs,
 		 osf,
 		 0);
 
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 07e0ffa6406da3494da46822a28a470a78e2f179..4c532285f2013aaf0df1acf09bf05f070f74f6c1 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -170,6 +170,18 @@
 #define ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U         "ENB_IPV4_ADDRESS_FOR_S1U"
 #define ENB_CONFIG_STRING_ENB_PORT_FOR_S1U              "ENB_PORT_FOR_S1U"
 
+#define ENB_CONFIG_STRING_RRH_GW_CONFIG                   "rrh_gw_config"
+#define ENB_CONFIG_STRING_RRH_GW_LOCAL_IF_NAME            "local_if_name"
+#define ENB_CONFIG_STRING_RRH_GW_LOCAL_ADDRESS            "local_address"
+#define ENB_CONFIG_STRING_RRH_GW_REMOTE_ADDRESS           "remote_address"
+#define ENB_CONFIG_STRING_RRH_GW_LOCAL_PORT               "local_port"
+#define ENB_CONFIG_STRING_RRH_GW_REMOTE_PORT              "remote_port"
+#define ENB_CONFIG_STRING_RRH_GW_ACTIVE                   "rrh_gw_active"
+#define ENB_CONFIG_STRING_RRH_GW_TRANSPORT_PREFERENCE     "tr_preference"
+#define ENB_CONFIG_STRING_RRH_GW_RF_TARGET_PREFERENCE     "rf_preference"
+#define ENB_CONFIG_STRING_RRH_GW_IQ_TXSHIFT               "iq_txshift"
+#define ENB_CONFIG_STRING_RRH_GW_TX_SAMPLE_ADVANCE        "tx_sample_advance"
+#define ENB_CONFIG_STRING_RRH_GW_TX_SCHEDULING_ADVANCE    "tx_scheduling_advance"
 
 #define ENB_CONFIG_STRING_ASN1_VERBOSITY                   "Asn1_verbosity"
 #define ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE              "none"
@@ -274,6 +286,34 @@ static void enb_config_display(void)
     } else {
       printf( "\tMNC:                \t%02"PRIu16":\n",enb_properties.properties[i]->mnc);
     }
+    
+    for (j=0; j< enb_properties.properties[i]->nb_rrh_gw; j++) {
+      if (enb_properties.properties[i]->rrh_gw_config[j].active == 1 ){
+	printf( "\n\tRRH GW %d config for eNB %u:\n\n", j, i);
+	printf( "\tinterface name :       \t%s:\n",enb_properties.properties[i]->rrh_gw_if_name);
+	printf( "\tlocal address  :       \t%s:\n",enb_properties.properties[i]->rrh_gw_config[j].local_address);
+	printf( "\tlocal port     :       \t%d:\n",enb_properties.properties[i]->rrh_gw_config[j].local_port);
+	printf( "\tremote address :       \t%s:\n",enb_properties.properties[i]->rrh_gw_config[j].remote_address);
+	printf( "\tremote port    :       \t%d:\n",enb_properties.properties[i]->rrh_gw_config[j].remote_port);
+	printf( "\ttx_scheduling_advance :\t%d:\n",enb_properties.properties[i]->rrh_gw_config[j].tx_scheduling_advance);
+	printf( "\ttx_sample_advance :    \t%d:\n",enb_properties.properties[i]->rrh_gw_config[j].tx_sample_advance);
+	printf( "\tiq_txshift :           \t%d:\n",enb_properties.properties[i]->rrh_gw_config[j].iq_txshift);
+	printf( "\ttransport  :           \t%s Ethernet:\n",(enb_properties.properties[i]->rrh_gw_config[j].raw == 1)? "RAW" : "UDP");
+	if (enb_properties.properties[i]->rrh_gw_config[j].exmimo == 1) {
+	  printf( "\tRF target  :           \tEXMIMO:\n\n");
+	} else if (enb_properties.properties[i]->rrh_gw_config[j].usrp_b200 == 1) {
+	  printf( "\tRF target  :           \tUSRP_B200:\n\n");
+	} else if (enb_properties.properties[i]->rrh_gw_config[j].usrp_x300 == 1) {
+	  printf( "\tRF target  :           \tUSRP_X300:\n\n");
+	} else if (enb_properties.properties[i]->rrh_gw_config[j].bladerf == 1) {
+	  printf( "\tRF target  :           \tBLADERF:\n\n");
+	} else if (enb_properties.properties[i]->rrh_gw_config[j].lmssdr == 1) {
+	  printf( "\tRF target  :           \tLMSSDR:\n\n");
+	} else {
+	  printf( "\tRF target  :           \tNONE:\n\n");
+	}
+      }
+    }
 
     for (j=0; j< enb_properties.properties[i]->nb_cc; j++) {
       printf( "\teutra band for CC %d:         \t%"PRId16":\n",j,enb_properties.properties[i]->eutra_band[j]);
@@ -455,15 +495,18 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
   config_setting_t *setting_srb1                  = NULL;
   config_setting_t *setting_mme_addresses         = NULL;
   config_setting_t *setting_mme_address           = NULL;
+  config_setting_t *setting_rrh_gws               = NULL;
+  config_setting_t *setting_rrh_gw                = NULL;
   config_setting_t *setting_enb                   = NULL;
   config_setting_t *setting_otg                   = NULL;
-  config_setting_t *subsetting_otg                   = NULL;
+  config_setting_t *subsetting_otg                = NULL;
   int               num_enb_properties            = 0;
   int               enb_properties_index          = 0;
   int               num_enbs                      = 0;
   int               num_mme_address               = 0;
-  int               num_otg_elements              =0;
-  int               num_component_carriers        =0;
+  int               num_rrh_gw                    = 0;
+  int               num_otg_elements              = 0;
+  int               num_component_carriers        = 0;
   int               i                             = 0;
   int               j                             = 0;
   int               parse_errors                  = 0;
@@ -558,10 +601,21 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
 
   libconfig_int     my_int;
 
+
+  char*             if_name                       = NULL;
   char*             ipv4                          = NULL;
+  char*             ipv4_remote                   = NULL;
   char*             ipv6                          = NULL;
   char*             active                        = NULL;
   char*             preference                    = NULL;
+
+  char*             tr_preference                 = NULL;
+  char*             rf_preference                 = NULL;
+  libconfig_int     tx_scheduling_advance         = 0;
+  libconfig_int     tx_sample_advance             = 0;
+  libconfig_int     iq_txshift                    = 0;
+  libconfig_int     local_port                    = 0;
+  libconfig_int     remote_port                   = 0;
   const char*       active_enb[MAX_ENB];
   char*             enb_interface_name_for_S1U    = NULL;
   char*             enb_ipv4_address_for_S1U      = NULL;
@@ -2136,6 +2190,97 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
               enb_properties.properties[enb_properties_index]->mme_ip_address[j].ipv6 = 1;
             }
           }
+	  // RRH Config 
+	  setting_rrh_gws = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_RRH_GW_CONFIG);
+	  if ( setting_rrh_gws != NULL) {
+          num_rrh_gw     = config_setting_length(setting_rrh_gws);
+          enb_properties.properties[enb_properties_index]->nb_rrh_gw = 0;
+
+          for (j = 0; j < num_rrh_gw; j++) {
+            setting_rrh_gw = config_setting_get_elem(setting_rrh_gws, j);
+
+            if (  !(
+                   config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_LOCAL_IF_NAME, (const char **)&if_name)
+		   && config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_LOCAL_ADDRESS, (const char **)&ipv4)
+                   && config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_REMOTE_ADDRESS , (const char **)&ipv4_remote)
+                   && config_setting_lookup_int(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_LOCAL_PORT, &local_port)
+                   && config_setting_lookup_int(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_REMOTE_PORT, &remote_port)
+                   && config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_ACTIVE, (const char **)&active)
+		   && config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_TRANSPORT_PREFERENCE, (const char **)&tr_preference)
+		   && config_setting_lookup_string(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_RF_TARGET_PREFERENCE, (const char **)&rf_preference)
+		   && config_setting_lookup_int(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_IQ_TXSHIFT, &iq_txshift) 
+		   && config_setting_lookup_int(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_TX_SAMPLE_ADVANCE, &tx_sample_advance)
+		   && config_setting_lookup_int(setting_rrh_gw, ENB_CONFIG_STRING_RRH_GW_TX_SCHEDULING_ADVANCE, &tx_scheduling_advance)
+                 )
+              ) {
+              AssertError (0, parse_errors ++,
+                           "Failed to parse eNB configuration file %s, %u th enb %u the RRH GW address !\n",
+                           lib_config_file_name_pP, i, j);
+              continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+            }
+
+            enb_properties.properties[enb_properties_index]->nb_rrh_gw += 1;
+
+	    enb_properties.properties[enb_properties_index]->rrh_gw_if_name = strdup(if_name);
+            enb_properties.properties[enb_properties_index]->rrh_gw_config[j].local_address  = strdup(ipv4);
+            enb_properties.properties[enb_properties_index]->rrh_gw_config[j].remote_address = strdup(ipv4_remote);
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].local_port = local_port;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].remote_port = remote_port;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].iq_txshift = iq_txshift;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].tx_sample_advance = tx_sample_advance;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].tx_scheduling_advance= tx_scheduling_advance;
+
+            if (strcmp(active, "yes") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].active = 1;
+            } 
+
+            if (strcmp(tr_preference, "udp") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].udp = 1;
+            } else if (strcmp(tr_preference, "raw") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].raw = 1;
+            } else {//if (strcmp(preference, "no") == 0) 
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].udp = 1;
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].raw = 1;
+            }
+
+	    if (strcmp(rf_preference, "exmimo") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].exmimo = 1;
+            } else if (strcmp(rf_preference, "usrp_b200") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_b200 = 1;
+	    } else if (strcmp(rf_preference, "usrp_x300") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_x300 = 1;
+            } else if (strcmp(rf_preference, "bladerf") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].bladerf = 1;
+	    } else if (strcmp(rf_preference, "bladerf") == 0) {
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].lmssdr = 1;	      
+            } else {//if (strcmp(preference, "no") == 0) 
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].exmimo = 1;
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_b200 = 1;
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_x300 = 1;
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].bladerf = 1;    
+              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].lmssdr = 1;    
+
+            }
+          }
+	  } else {
+	    enb_properties.properties[enb_properties_index]->nb_rrh_gw = 0;	    
+	    enb_properties.properties[enb_properties_index]->rrh_gw_if_name = "none";
+            enb_properties.properties[enb_properties_index]->rrh_gw_config[j].local_address  = "0.0.0.0";
+            enb_properties.properties[enb_properties_index]->rrh_gw_config[j].remote_address = "0.0.0.0";
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].local_port= 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].remote_port= 0;	    
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].active = 0;	    
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].udp = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].raw = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].tx_scheduling_advance = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].tx_sample_advance = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].iq_txshift = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].exmimo = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_b200 = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_x300 = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].bladerf = 0;
+	    enb_properties.properties[enb_properties_index]->rrh_gw_config[j].lmssdr = 0;
+	  }
 
           // SCTP SETTING
           enb_properties.properties[enb_properties_index]->sctp_out_streams = SCTP_OUT_STREAMS;
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index 113681dafe62cd476c14ace0c09dc1644a1b4b62..422ef67cd32971638f68e5f5f605e48e59c2ce86 100755
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -78,6 +78,24 @@ typedef struct mme_ip_address_s {
   char     *ipv6_address;
 } mme_ip_address_t;
 
+typedef struct rrh_gw_config_s {
+  unsigned  udp:1;
+  unsigned  raw:1;
+  unsigned  active:1;
+  char     *local_address;
+  char     *remote_address;
+  uint16_t  local_port;
+  uint16_t  remote_port;
+  int tx_scheduling_advance;
+  int tx_sample_advance;
+  int iq_txshift;
+  unsigned  exmimo:1;
+  unsigned  usrp_b200:1;
+  unsigned  usrp_x300:1;
+  unsigned  bladerf:1; 
+  unsigned  lmssdr:1;  
+} rrh_gw_config_t;
+
 typedef struct Enb_properties_s {
   /* Unique eNB_id to identify the eNB within EPC.
    * For macro eNB ids this field should be 20 bits long.
@@ -203,6 +221,13 @@ typedef struct Enb_properties_s {
   char               *enb_interface_name_for_S1_MME;
   in_addr_t           enb_ipv4_address_for_S1_MME;
 
+
+  /* Nb of RRH to connect to */
+  uint8_t             nb_rrh_gw;
+  char               *rrh_gw_if_name;
+  /* List of MME to connect to */
+  rrh_gw_config_t       rrh_gw_config[4];
+
   // otg config
   /* Nb of OTG elements */
   uint8_t            num_otg_elements;
diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.c b/openair2/UTIL/LOG/vcd_signal_dumper.c
index 8dfbfd6ef5cb9d9d666a9c4e09591fa164fbee3f..31ce2e0d71078bd4d12586db7a27ba861a61a6d9 100644
--- a/openair2/UTIL/LOG/vcd_signal_dumper.c
+++ b/openair2/UTIL/LOG/vcd_signal_dumper.c
@@ -106,6 +106,9 @@ const char* eurecomVariablesNames[] = {
   "lhw_cnt_tx",
   "pck_rx",
   "pck_tx",
+  "rx_seq_num",
+  "rx_seq_num_prv",
+  "tx_seq_num",
   "cnt",
   "dummy_dump",
   "itti_send_msg",
diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.h b/openair2/UTIL/LOG/vcd_signal_dumper.h
index 68257484f0a1c141d3f1a2392f157d729b09d3f9..9ca55846fd2aef75d3da598dbdd4f250a6591db6 100644
--- a/openair2/UTIL/LOG/vcd_signal_dumper.h
+++ b/openair2/UTIL/LOG/vcd_signal_dumper.h
@@ -78,6 +78,9 @@ typedef enum {
   VCD_SIGNAL_DUMPER_VARIABLES_TX_LHWCNT,
   VCD_SIGNAL_DUMPER_VARIABLES_RX_PCK,
   VCD_SIGNAL_DUMPER_VARIABLES_TX_PCK,
+  VCD_SIGNAL_DUMPER_VARIABLES_RX_SEQ_NUM,
+  VCD_SIGNAL_DUMPER_VARIABLES_RX_SEQ_NUM_PRV,
+  VCD_SIGNAL_DUMPER_VARIABLES_TX_SEQ_NUM,
   VCD_SIGNAL_DUMPER_VARIABLES_CNT,
   VCD_SIGNAL_DUMPER_VARIABLES_DUMMY_DUMP,
   VCD_SIGNAL_DUMPER_VARIABLE_ITTI_SEND_MSG,
diff --git a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
index c7f2ee7b5e8d8c83a7b74ddbbca02b2ab7a6e116..2f73d6978c26c8bdf6710537fe424cb8899ba98e 100644
--- a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+++ b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
@@ -38,6 +38,11 @@
 #include <inttypes.h>
 #include "bladerf_lib.h"
 
+/** @addtogroup _BLADERF_PHY_RF_INTERFACE_
+ * @{
+ */
+
+//! Number of BladeRF devices 
 #ifdef __SSE4_1__
 #  include <smmintrin.h>
 #endif
@@ -47,13 +52,21 @@
 #endif
 
 int num_devices=0;
+
 /*These items configure the underlying asynch stream used by the the sync interface. 
  */
 
-int trx_brf_init(openair0_device *openair0) {
+/*! \brief BladeRF Init function (not used at the moment)
+ * \param device RF frontend parameters set by application
+ */
+int trx_brf_init(openair0_device *device) {
   
 }
 
+/*! \brief get current timestamp
+ *\param device the hardware to use 
+ *\param module the bladeRf module
+ */
  
 openair0_timestamp trx_get_timestamp(openair0_device *device, bladerf_module module) {
   int status;
@@ -69,18 +82,31 @@ openair0_timestamp trx_get_timestamp(openair0_device *device, bladerf_module mod
   return meta.timestamp;
 }
 
-
-int trx_brf_start(openair0_device *openair0) {
+/*! \brief Start BladeRF
+ *\param device the hardware to use 
+ */
+int trx_brf_start(openair0_device *device) {
 
   return 0;
 }
 
+/*! \brief Get BladeRF stats
+ *\param device the hardware to use 
+ */
 static void trx_brf_stats(openair0_device *device){
 
 
 }
 
-static int trx_brf_write(openair0_device *device,openair0_timestamp ptimestamp, void **buff, int nsamps, int cc) {
+/*! \brief Called to send samples to the BladeRF RF target
+      @param device pointer to the device structure specific to the RF hardware target
+      @param timestamp The timestamp at whicch the first sample MUST be sent 
+      @param buff Buffer which holds the samples
+      @param nsamps number of samples to be sent
+      @param cc index of the component carrier
+      @param flags Ignored for the moment
+*/ 
+static int trx_brf_write(openair0_device *device,openair0_timestamp ptimestamp, void **buff, int nsamps, int cc, int flags) {
   
   int status;
   brf_state_t *brf = (brf_state_t*)device->priv;
@@ -121,6 +147,16 @@ static int trx_brf_write(openair0_device *device,openair0_timestamp ptimestamp,
   return(0);
 }
 
+/*! \brief Receive samples from hardware.
+ * Read \ref nsamps samples from each channel to buffers. buff[0] is the array for
+ * the first channel. *ptimestamp is the time at which the first sample
+ * was received.
+ * \param device the hardware to use
+ * \param[out] ptimestamp the time at which the first sample was received.
+ * \param[out] buff An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of samples \ref nsamps.
+ * \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
+ * \param cc  Index of component carrier
+*/
 static int trx_brf_read(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps, int cc) {
 
   int status=0;
@@ -157,6 +193,9 @@ static int trx_brf_read(openair0_device *device, openair0_timestamp *ptimestamp,
 
 }
 
+/*! \brief Terminate operation of the BladeRF transceiver -- free all associated resources 
+ * \param device the hardware to use
+ */
 int trx_brf_end(openair0_device *device) {
 
   int status;
@@ -172,25 +211,39 @@ int trx_brf_end(openair0_device *device) {
   return 0;
 }
 
-
+/*! \brief print the BladeRF statistics  
+* \param device the hardware to use
+* \returns  0 on success
+*/
 int trx_brf_get_stats(openair0_device* device) {
 
   return(0);
 
 }
 
+/*! \brief Reset the BladeRF statistics  
+* \param device the hardware to use
+* \returns  0 on success
+*/
 int trx_brf_reset_stats(openair0_device* device) {
 
   return(0);
 
 }
 
+/*! \brief Stop USRP
+ * \param device the hardware to use
+ */
 int trx_brf_stop(openair0_device* device) {
 
   return(0);
 
 }
 
+/*! \brief Set frequencies (TX/RX)
+ * \param device the hardware to use
+ * \returns 0 in success 
+ */
 int trx_brf_set_freq(openair0_device* device) {
 
   int status;
@@ -213,12 +266,19 @@ int trx_brf_set_freq(openair0_device* device) {
   return(0);
 
 }
+
+/*! \brief Set Gains (TX/RX)
+ * \param device the hardware to use
+ * \returns 0 in success 
+ */
 int trx_brf_set_gains(openair0_device* device) {
 
   return(0);
 
 }
 
+
+
 #define RXDCLENGTH 16384
 int16_t cos_fsover8[8]  = {2047,   1447,      0,  -1448,  -2047,  -1448,     0,   1447};
 int16_t cos_3fsover8[8] = {2047,  -1448,      0,   1447,  -2047,   1447,     0,  -1448};
@@ -822,15 +882,23 @@ void calibrate_rf(openair0_device *device) {
   //  write_output("blade_rf_test.m","rxs",calib_buff,RXDCLENGTH,1,1);
 }
 
-int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openair0_cfg) {
-
+/*! \brief Initialize Openair BLADERF target. It returns 0 if OK 
+ * \param device the hardware to use
+ * \param openair0_cfg RF frontend parameters set by application
+ */
+int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
   int status;
   int card=0;
   
   brf_state_t *brf = (brf_state_t*)malloc(sizeof(brf_state_t));
   memset(brf, 0, sizeof(brf_state_t));
+  /* device specific */
+  openair0_cfg->txlaunch_wait = 1;//manage when TX processing is triggered
+  openair0_cfg->txlaunch_wait_slotcount = 1; //manage when TX processing is triggered
+  openair0_cfg->iq_txshift = 0;// shift
+  openair0_cfg->iq_rxrescale = 15;//rescale iqs
+  
   // init required params
-
   switch ((int)openair0_cfg->sample_rate) {
   case 30720000:
     openair0_cfg->samples_per_packet    = 2048;
@@ -857,7 +925,8 @@ int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openai
     exit(-1);
     break;
   }
-
+  openair0_cfg->iq_txshift= 0;
+  openair0_cfg->iq_rxrescale = 15; /*not sure*/
   openair0_cfg->rx_gain_calib_table = calib_table_fx4;
 
   //  The number of buffers to use in the underlying data stream
@@ -1001,6 +1070,7 @@ int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openai
   printf("BLADERF: Initializing openair0_device\n");
   device->priv           = brf; 
   device->Mod_id         = num_devices++;
+  device->type             = BLADERF_DEV; 
   device->trx_start_func = trx_brf_start;
   device->trx_end_func   = trx_brf_end;
   device->trx_read_func  = trx_brf_read;
@@ -1019,6 +1089,9 @@ int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openai
   return 0;
 }
 
+/*! \brief bladeRF error report 
+ * \param status 
+ */
 int brf_error(int status) {
   
   //exit(-1);
@@ -1026,7 +1099,9 @@ int brf_error(int status) {
 }
 
 
-
+/*! \brief Open BladeRF from serial port
+ * \param serial name of serial port on which to open BladeRF device
+ */
 struct bladerf * open_bladerf_from_serial(const char *serial) {
 
   int status;
@@ -1053,6 +1128,10 @@ struct bladerf * open_bladerf_from_serial(const char *serial) {
     return dev;
   }
 }
+
+/*! \brief Get BladeRF log level
+ * \param log_level log level
+ */
 int get_brf_log_level(int log_level){
 
   int level=BLADERF_LOG_LEVEL_INFO;
@@ -1081,3 +1160,4 @@ int get_brf_log_level(int log_level){
   }
   return level;
 }
+/*@}*/
diff --git a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h
index 15e1d39da744b508138763344ede60c2267f33fe..3a05c80e5c8f83e8d7e7434e3e5ead3484493709 100644
--- a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h
+++ b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h
@@ -37,45 +37,69 @@
 #include "common_lib.h"
 #include "log.h"
 
+/** @addtogroup _BLADERF_PHY_RF_INTERFACE_
+ * @{
+ */
+
+/*! \brief BladeRF specific data structure */ 
 typedef struct {
 
-  // opaque BRF data struct
+  //! opaque BladeRF device struct. An empty ("") or NULL device identifier will result in the first encountered device being opened (using the first discovered backend)
   struct bladerf *dev;
-  // An empty ("") or NULL device identifier will result in the first encountered device being opened (using the first discovered backend)
-
+  
+  //! Number of buffers
   unsigned int num_buffers;
+  //! Buffer size 
   unsigned int buffer_size;
+  //! Number of transfers
   unsigned int num_transfers;
+  //! RX timeout
   unsigned int rx_timeout_ms;
+  //! TX timeout
   unsigned int tx_timeout_ms;
-
+  //! Metadata for RX
   struct bladerf_metadata meta_rx;
+  //!Metadata for TX
   struct bladerf_metadata meta_tx;
-
+  //! Sample rate
   unsigned int sample_rate;
-  // time offset between transmiter timestamp and receiver timestamp;
+  //! time offset between transmiter timestamp and receiver timestamp;
   double tdiff;
-  // use brf_time_offset to get this value
+  //! TX number of forward samples use brf_time_offset to get this value
   int tx_forward_nsamps; //166 for 20Mhz
 
 
   // --------------------------------
   // Debug and output control
   // --------------------------------
+  //! Number of underflows
   int num_underflows;
+  //! Number of overflows
   int num_overflows;
+  //! number of sequential errors
   int num_seq_errors;
+  //! number of RX errors
   int num_rx_errors;
+  //! Number of TX errors
   int num_tx_errors;
 
+  //! timestamp of current TX
   uint64_t tx_current_ts;
+  //! timestamp of current RX
   uint64_t rx_current_ts;
+  //! number of actual samples transmitted
   uint64_t tx_actual_nsamps;
+  //! number of actual samples received
   uint64_t rx_actual_nsamps;
+  //! number of TX samples
   uint64_t tx_nsamps;
+  //! number of RX samples
   uint64_t rx_nsamps;
+  //! number of TX count
   uint64_t tx_count;
+  //! number of RX count
   uint64_t rx_count;
+  //! timestamp of RX packet
   openair0_timestamp rx_timestamp;
 
 } brf_state_t;
@@ -84,3 +108,4 @@ typedef struct {
  */
 
 int brf_error(int status);
+/*@}*/
diff --git a/targets/ARCH/COMMON/common_lib.c b/targets/ARCH/COMMON/common_lib.c
index 7479a6aa0b475ebd7b53efd38b9e13b36f2b7e89..e4ee06d0a480ac8d86123cd6fe536745a381b360 100644
--- a/targets/ARCH/COMMON/common_lib.c
+++ b/targets/ARCH/COMMON/common_lib.c
@@ -37,31 +37,140 @@
  * \warning
  */
 #include <stdio.h>
+#include <strings.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <string.h>
+
 #include "common_lib.h"
 
+int set_device(openair0_device *device) {
+
+  switch (device->type) {
+    
+  case EXMIMO_DEV:
+    printf("[%s] has loaded EXPRESS MIMO device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
+    break;
+  case USRP_B200_DEV:
+    printf("[%s] has loaded USRP B200 device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    break;
+case USRP_X300_DEV:
+    printf("[%s] has loaded USRP X300 device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    break;
+  case BLADERF_DEV:
+    printf("[%s] has loaded BLADERF device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    break;
+  case LMSSDR_DEV:
+    printf("[%s] has loaded LMSSDR device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    break;
+  case NONE_DEV:
+    printf("[%s] has not loaded a HW device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
+    break;    
+  default:
+    printf("[%s] invalid HW device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    return -1;
+  }
+  return 0;
+}
+
+int set_transport(openair0_device *device) {
+
+  switch (device->transp_type) {
+    
+  case ETHERNET_TP:
+    printf("[%s] has loaded ETHERNET trasport protocol.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
+    return 0;     
+    break;
+  case NONE_TP:
+    printf("[%s] has not loaded a transport protocol.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
+    return 0; 
+    break;    
+  default:
+    printf("[%s] invalid transport protocol.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
+    return -1;
+    break;
+  }
+  
+}
 
-int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
+/* look for the interface library and load it */
+int load_lib(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * cfg, uint8_t flag) {
   
-#ifdef ETHERNET 
-  device->type=ETH_IF; 
-  device->func_type = BBU_FUNC;
-  printf(" openair0_dev_init_eth ...\n");
-  return(openair0_dev_init_eth(device, openair0_cfg));
-
-#elif EXMIMO
-  device->type=EXMIMO_IF;
-  printf("openair0_dev_init_exmimo...\n");
-  return(openair0_dev_init_exmimo(device, openair0_cfg));
-#elif OAI_USRP
-  device->type=USRP_B200_IF;
-  printf("openair0_dev_init_usrp ...\n");
-  return(openair0_dev_init_usrp(device, openair0_cfg));
-
-#elif OAI_BLADERF  
-  device->type=BLADERF_IF;
-  printf(" openair0_dev_init_bladerf ...\n");   
-  return(openair0_dev_init_bladerf(device, openair0_cfg));	
-
-#endif 
-   
+  void *lib_handle;
+  oai_device_initfunc_t dp ;
+  oai_transport_initfunc_t tp ;
+
+  if (flag == BBU_LOCAL_RADIO_HEAD) {
+      lib_handle = dlopen(OAI_RF_LIBNAME, RTLD_LAZY);
+      if (!lib_handle) {
+	printf( "Unable to locate %s: HW device set to NONE_DEV.\n", OAI_RF_LIBNAME);
+	return 0;
+      } 
+      
+      dp = dlsym(lib_handle,"device_init");
+      
+      if (dp != NULL ) {
+	dp(device,openair0_cfg);
+      } else {
+	fprintf(stderr, "%s %d:oai device intializing function not found %s\n", __FILE__, __LINE__, dlerror());
+	return -1;
+      }
+    } else {
+      lib_handle = dlopen(OAI_TP_LIBNAME, RTLD_LAZY);
+      if (!lib_handle) {
+	printf( "Unable to locate %s: transport protocol set to NONE_TP.\n", OAI_TP_LIBNAME);
+	return 0;
+      } 
+      
+      tp = dlsym(lib_handle,"transport_init");
+      
+      if (tp != NULL ) {
+	tp(device,openair0_cfg,cfg);
+      } else {
+	fprintf(stderr, "%s %d:oai device intializing function not found %s\n", __FILE__, __LINE__, dlerror());
+	return -1;
+      }
+    } 
+    
+  return 0; 	       
 }
+
+
+
+int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg) {
+  
+  int rc;
+  //ToDo: EXMIMO harmonization is not complete. That is the reason for this ifdef
+  #ifdef EXMIMO
+  device_init(device, openair0_cfg);
+  #else
+  rc=load_lib(device, openair0_cfg, NULL,BBU_LOCAL_RADIO_HEAD );
+  if ( rc >= 0) {       
+    if ( set_device(device) < 0) {
+      fprintf(stderr, "%s %d:Unsupported radio head\n",__FILE__, __LINE__);
+      return -1;		   
+    }   
+  }
+  #endif
+  return 0;
+}
+
+int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params) {
+  int rc;
+  rc=load_lib(device, openair0_cfg, eth_params, BBU_REMOTE_RADIO_HEAD);
+  if ( rc >= 0) {       
+    if ( set_transport(device) < 0) {
+      fprintf(stderr, "%s %d:Unsupported transport protocol\n",__FILE__, __LINE__);
+      return -1;		   
+      }   
+  }
+  return 0;
+
+}
+
+
+
+
+
+
+
diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index a3fe9e9dbd33973354db652203a8d9e4c6461164..dc0b31af58c0b974c4597f2d6b540a98c718b591 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -42,11 +42,20 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+/* name of shared library implementing the radio front end */
+#define OAI_RF_LIBNAME        "liboai_device.so"
+/* name of shared library implementing the transport */
+#define OAI_TP_LIBNAME        "liboai_transpro.so"
+
+/* flags for BBU to determine whether the attached radio head is local or remote */
+#define BBU_LOCAL_RADIO_HEAD  0
+#define BBU_REMOTE_RADIO_HEAD 1
+
 typedef int64_t openair0_timestamp;
 typedef volatile int64_t openair0_vtimestamp;
 
  
-/* structrue holds the parameters to configure USRP devices*/
+/*!\brief structrue holds the parameters to configure USRP devices*/
 typedef struct openair0_device_t openair0_device;
 
 
@@ -65,10 +74,56 @@ typedef enum {
 } duplex_mode_t;
 
 
-/** @addtogroup _PHY_RF_INTERFACE_
+
+/** @addtogroup _GENERIC_PHY_RF_INTERFACE_
  * @{
  */
- 
+/*!\brief RF device types
+ */
+typedef enum {
+  MIN_RF_DEV_TYPE = 0,
+  /*!\brief device is ExpressMIMO */
+  EXMIMO_DEV,
+  /*!\brief device is USRP B200/B210*/
+  USRP_B200_DEV,
+  /*!\brief device is USRP X300/X310*/
+  USRP_X300_DEV,
+  /*!\brief device is BLADE RF*/
+  BLADERF_DEV,
+  /*!\brief device is LMSSDR (SoDeRa)*/
+  LMSSDR_DEV,
+  /*!\brief device is NONE*/
+  NONE_DEV,
+  MAX_RF_DEV_TYPE
+
+} dev_type_t;
+
+/*!\brief transport protocol types
+ */
+typedef enum {
+  MIN_TRANSP_TYPE = 0,
+  /*!\brief transport protocol ETHERNET */
+  ETHERNET_TP,
+  /*!\brief no transport protocol*/
+  NONE_TP,
+  MAX_TRANSP_TYPE
+
+} transport_type_t;
+
+
+/*!\brief  openair0 device host type */
+typedef enum {
+  MIN_HOST_TYPE = 0,
+ /*!\brief device functions within a BBU */
+  BBU_HOST,
+ /*!\brief device functions within a RRH */
+  RRH_HOST,
+  MAX_HOST_TYPE
+
+}host_type_t;
+
+
+/*! \brief RF Gain clibration */ 
 typedef struct {
   //! Frequency for which RX chain was calibrated
   double freq;
@@ -76,10 +131,11 @@ typedef struct {
   double offset;
 } rx_gain_calib_table_t;
 
+/*! \brief RF frontend parameters set by application */
 typedef struct {
   //! Module ID for this configuration
   int Mod_id;
-  // device log level
+  //! device log level
   int log_level;
   //! duplexing mode
   duplex_mode_t duplex_mode;
@@ -90,11 +146,15 @@ typedef struct {
   //! the sample rate for both transmit and receive.
   double sample_rate;
   //! number of samples per RX/TX packet (USRP + Ethernet)
-  int samples_per_packet;
+  unsigned int samples_per_packet; 
   //! delay in sending samples (write)  due to hardware access, softmodem processing and fronthaul delay if exist
   int tx_scheduling_advance;
   //! offset in samples between TX and RX paths
   int tx_sample_advance;
+  //! configurable tx thread lauch delay 
+  int txlaunch_wait;               /* 1 or 0 */
+  //! configurable tx thread lauch delay 
+  int txlaunch_wait_slotcount;
   //! number of RX channels (=RX antennas)
   int rx_num_channels;
   //! number of TX channels (=TX antennas)
@@ -125,77 +185,72 @@ typedef struct {
   double tx_bw;
   //! Auto calibration flag
   int autocal[4];
-  //! RRH IP addr for Ethernet interface
-  char *remote_ip;
-  //! RRH port number for Ethernet interface
-  int remote_port;
-  //! my IP addr for Ethernet interface (eNB/BBU, UE)
-  char *my_ip;
-  //! my port number for Ethernet interface (eNB/BBU, UE)
-  int my_port;
-
+  //! rf devices work with x bits iqs when oai have its own iq format
+  //! the two following parameters are used to convert iqs 
+  int iq_txshift;
+  int iq_rxrescale;
+  //! remote IP/MAC addr for Ethernet interface
+  char *remote_addr;
+  //! remote port number for Ethernet interface
+  unsigned int remote_port;
+  //! local IP/MAC addr for Ethernet interface (eNB/BBU, UE)
+  char *my_addr;
+  //! local port number for Ethernet interface (eNB/BBU, UE)
+  unsigned int my_port;
+  //! Configuration file for LMS7002M
+  char *configFilename;
 } openair0_config_t;
 
+/*! \brief RF mapping */ 
 typedef struct {
-  /* card id */
+  //! card id
   int card;
-  /* rf chain id */
+  //! rf chain id
   int chain;
 } openair0_rf_map;
 
 
-
-/*!\brief interface types that apply to modules (RRH_BBU/RRH_UE) created in RRH (rrh_gw.c)
-          and are defined with respect to the RF device that is present in RRH
-          -RRH_BBU modules have two devices, one is by default ETHERNET (will have ETH_IF) and the other one is a
-	  RF device (EXMIMO,USRP,BLADERF) or no device (NONE_IF).
-          -RRH_UE modules have two devices one is by default ETHERNET (will have ETH_IF) 
-	  and the other one by default not present so it will have NONE_IF
- */
-typedef enum {
-  MIN_DEV_TYPE = 0,
-  /*!\brief device is ETH */
-  ETH_IF,
-  /*!\brief device is ExpressMIMO */
-  EXMIMO_IF,
-  /*!\brief device is USRP B200/B210*/
-  USRP_B200_IF,
-  /*!\brief device is USRP X300/X310*/
-  USRP_X300_IF,
-  /*!\brief device is BLADE RF*/
-  BLADERF_IF,
-  /*!\brief device is NONE*/
-  NONE_IF,
-  MAX_DEV_TYPE
-
-} dev_type_t;
-
-
-/*!\brief  openair0 device host type */
-typedef enum {
-  MIN_FUNC_TYPE = 0,
- /*!\brief device functions within a BBU */
-  BBU_FUNC,
- /*!\brief device functions within a RRH */
-  RRH_FUNC,
-  MAX_FUNC_TYPE
-
-}func_type_t;
-
+typedef struct {
+  char *remote_addr;
+  //! remote port number for Ethernet interface
+  uint16_t remote_port;
+  //! local IP/MAC addr for Ethernet interface (eNB/BBU, UE)
+  char *my_addr;
+  //! local port number for Ethernet interface (eNB/BBU, UE)
+  uint16_t  my_port;
+  //! local Ethernet interface (eNB/BBU, UE)
+  char *local_if_name;
+  //! tx_sample_advance for RF + ETH
+  uint8_t tx_sample_advance;
+  //! tx_scheduling_advance for RF + ETH
+  uint8_t tx_scheduling_advance;
+  //! iq_txshift  for RF + ETH
+  uint8_t iq_txshift;
+  //! transport type preference  (RAW/UDP)
+  uint8_t transp_preference;
+  //! radio front end preference (EXMIMO,USRP, BALDERF,LMSSDR)
+  uint8_t rf_preference;
+} eth_params_t;
+
+
+/*!\brief structure holds the parameters to configure USRP devices */
 struct openair0_device_t {
-  /* Module ID of this device */
+  /*!brief Module ID of this device */
   int Mod_id;
   
-  /* Type of this device */
+  /*!brief Type of this device */
   dev_type_t type;
 
-   /* Type of the device's host (BBU/RRH) */
-  func_type_t func_type;
+  /*!brief Transport protocol type that the device suppports (in case I/Q samples need to be transported) */
+  transport_type_t transp_type;
+
+   /*!brief Type of the device's host (BBU/RRH) */
+  host_type_t host_type;
 
-  /* RF frontend parameters set by application */
+  /* !brief RF frontend parameters set by application */
   openair0_config_t *openair0_cfg;
 
-  /* Can be used by driver to hold internal structure*/
+  /*!brief Can be used by driver to hold internal structure*/
   void *priv;
 
   /* Functions API, which are called by the application*/
@@ -217,7 +272,7 @@ struct openair0_device_t {
       @param msg pointer to the message structure passed between BBU-RRH
       @param msg_len length of the message  
   */  
-  int (*trx_reply_func)(openair0_device *openair0, void *msg, ssize_t msg_len);
+  int (*trx_reply_func)(openair0_device *device, void *msg, ssize_t msg_len);
 
   /*! \brief Called to send samples to the RF target
       @param device pointer to the device structure specific to the RF hardware target
@@ -235,9 +290,9 @@ struct openair0_device_t {
    * was received.
    * \param device the hardware to use
    * \param[out] ptimestamp the time at which the first sample was received.
-   * \param[out] An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of samples \ref nsamps.
+   * \param[out] buff An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of samples \ref nsamps.
    * \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
-   * \param cc Number of channels. If cc == 1, only buff[0] is filled with samples.
+   * \param antenna_id Index of antenna for which to receive samples
    * \returns the number of sample read
    */
   int (*trx_read_func)(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps,int antenna_id);
@@ -254,49 +309,64 @@ struct openair0_device_t {
    */
   int (*trx_reset_stats_func)(openair0_device *device);
 
-  /*! \brief Terminate operation of the transceiver -- free all associated resources */
+  /*! \brief Terminate operation of the transceiver -- free all associated resources 
+   * \param device the hardware to use
+   */
   void (*trx_end_func)(openair0_device *device);
 
-  /* Terminate operation  */
+  /*! \brief Stop operation of the transceiver 
+   * \param card RF Card to use
+   */
   int (*trx_stop_func)(int card);
 
   /* Functions API related to UE*/
 
   /*! \brief Set RX feaquencies 
-   * \param 
+   * \param device the hardware to use
+   * \param openair0_cfg RF frontend parameters set by application
+   * \param exmimo_dump_config  dump EXMIMO configuration 
    * \returns 0 in success 
    */
   int (*trx_set_freq_func)(openair0_device* device, openair0_config_t *openair0_cfg,int exmimo_dump_config);
   
   /*! \brief Set gains
-   * \param 
+   * \param device the hardware to use
+   * \param openair0_cfg RF frontend parameters set by application
    * \returns 0 in success 
    */
   int (*trx_set_gains_func)(openair0_device* device, openair0_config_t *openair0_cfg);
 
 };
 
+/* type of device init function, implemented in shared lib */
+typedef int(*oai_device_initfunc_t)(openair0_device *device, openair0_config_t *openair0_cfg);
+/* type of transport init function, implemented in shared lib */
+typedef int(*oai_transport_initfunc_t)(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params);
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-/*! \brief Initialize Openair RF target. It returns 0 if OK */
-  int openair0_device_init(openair0_device* device, openair0_config_t *openair0_cfg);
+
+  /*! \brief Initialize openair RF target. It returns 0 if OK */
+  int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg);  
+  /*! \brief Initialize transport protocol . It returns 0 if OK */
+  int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params);
+
   
-  //USRP
-/*! \brief Get the current timestamp of USRP */
+ /*! \brief Get current timestamp of USRP
+  * \param device the hardware to use
+  */
   openair0_timestamp get_usrp_time(openair0_device *device);
-/*! \brief Set the RX frequency of USRP RF TARGET */
+
+ /*! \brief Set RX frequencies 
+  * \param device the hardware to use
+  * \param openair0_cfg RF frontend parameters set by application
+  * \returns 0 in success 
+  */
   int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
-  
-//extern
-/*! \brief Initialize Openair ETHERNET target. It returns 0 if OK */
-  int openair0_dev_init_eth(openair0_device *device, openair0_config_t *openair0_cfg);
-  int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openair0_cfg);
-  int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_cfg);
-  int openair0_dev_init_exmimo(openair0_device *device, openair0_config_t *openair0_cfg);
+
 /*@}*/
 
 #ifdef __cplusplus
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
new file mode 100644
index 0000000000000000000000000000000000000000..a360f2655656906a885fde7281847ade2ecc8192
--- /dev/null
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
@@ -0,0 +1,319 @@
+/*******************************************************************************
+    OpenAirInterface
+    Copyright(c) 1999 - 2014 Eurecom
+
+    OpenAirInterface is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+
+    OpenAirInterface is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenAirInterface.The full GNU General Public License is
+    included in this distribution in the file called "COPYING". If not,
+    see <http://www.gnu.org/licenses/>.
+
+   Contact Information
+   OpenAirInterface Admin: openair_admin@eurecom.fr
+   OpenAirInterface Tech : openair_tech@eurecom.fr
+   OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
+
+   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+
+ *******************************************************************************/
+/*! \file ethernet_lib.c 
+ * \brief API to stream I/Q samples over standard ethernet
+ * \author  add alcatel Katerina Trilyraki, Navid Nikaein, Pedro Dinis, Lucio Ferreira, Raymond Knopp
+ * \date 2015
+ * \version 0.2
+ * \company Eurecom
+ * \maintainer:  navid.nikaein@eurecom.fr
+ * \note
+ * \warning 
+ */
+
+#include <arpa/inet.h>
+#include <linux/if_packet.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/ether.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "common_lib.h"
+#include "ethernet_lib.h"
+
+#define DEBUG 0
+
+struct sockaddr_ll dest_addr[MAX_INST];
+struct sockaddr_ll local_addr[MAX_INST];
+int addr_len[MAX_INST];
+struct ifreq if_index[MAX_INST];
+struct ether_header eh; 
+
+int eth_socket_init_raw(openair0_device *device) {
+ 
+  int i = 0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  int Mod_id = device->Mod_id;
+  const char *local_mac, *remote_mac;
+  int local_port=0, remote_port=0;
+  int sock_dom=0;
+  int sock_type=0;
+  int sock_proto=0;  
+ 
+  if (device->host_type == RRH_HOST ) {  /* RRH doesn't know remote MAC(will be retrieved from first packet send from BBU) and remote port(don't care) */
+    local_mac = device->openair0_cfg->my_addr; 
+    local_port = device->openair0_cfg->my_port;    
+    remote_mac = malloc(ETH_ALEN);
+    memset(remote_mac,0,ETH_ALEN);
+    remote_port = 0;    
+    printf("[%s] local MAC addr %s remote MAC addr %s\n","RRH", local_mac,remote_mac);    
+  } else {
+    local_mac = device->openair0_cfg->my_addr;
+    local_port = device->openair0_cfg->my_port;  
+    remote_mac = device->openair0_cfg->remote_addr;
+    remote_port = device->openair0_cfg->remote_port;  
+    printf("[%s] local MAC addr %s remote MAC addr %s\n","BBU", local_mac,remote_mac);    
+  }
+   
+  
+  /* Open a RAW socket to send on */
+  sock_dom=AF_PACKET;
+  sock_type=SOCK_RAW;
+  sock_proto=IPPROTO_RAW;
+  if ((eth->sockfd[Mod_id] = socket(sock_dom, sock_type, sock_proto)) == -1) {
+    perror("ETHERNET: Error opening RAW socket");
+    exit(0);
+  }
+  
+  /* initialize destination address */
+  for (i=0; i< MAX_INST; i++) {
+    bzero((void *)&(local_addr[i]), sizeof(struct sockaddr_ll));
+    bzero((void *)&(if_index[i]), sizeof(struct ifreq)); 
+  }
+  /* Get the index of the interface to send on */
+  strcpy(if_index[Mod_id].ifr_name,eth->if_name[Mod_id]);
+  if (ioctl(eth->sockfd[Mod_id], SIOCGIFINDEX, &(if_index[Mod_id])) < 0)
+    perror("SIOCGIFINDEX");
+   
+  local_addr[Mod_id].sll_family   = AF_PACKET;
+  local_addr[Mod_id].sll_ifindex  = if_index[Mod_id].ifr_ifindex;
+  /* hear traffic from specific protocol*/
+  local_addr[Mod_id].sll_protocol = htons((short)device->openair0_cfg->my_port);
+  local_addr[Mod_id].sll_halen    = ETH_ALEN;
+  local_addr[Mod_id].sll_pkttype  = PACKET_OTHERHOST;
+  addr_len[Mod_id] = sizeof(struct sockaddr_ll);
+  
+ if (bind(eth->sockfd[Mod_id],(struct sockaddr *)&local_addr[Mod_id],addr_len[Mod_id])<0) {
+   perror("ETHERNET: Cannot bind to socket");
+   exit(0);
+ }
+ 
+ /* Construct the Ethernet header */ 
+ ether_aton_r(local_mac, (struct ether_addr *)(&(eh.ether_shost)));
+ ether_aton_r(remote_mac, (struct ether_addr *)(&(eh.ether_dhost)));
+ eh.ether_type = htons((short)device->openair0_cfg->my_port);
+
+ printf("[%s] binding mod_%d to hardware address %x:%x:%x:%x:%x:%x\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"),Mod_id,eh.ether_shost[0],eh.ether_shost[1],eh.ether_shost[2],eh.ether_shost[3],eh.ether_shost[4],eh.ether_shost[5]);
+ 
+ return 0;
+}
+
+
+int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags) {
+  
+  int bytes_sent=0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  int Mod_id = device->Mod_id;
+  int sendto_flag =0;
+  int i=0;
+  //sendto_flag|=flags;
+
+  eth->tx_nsamps=nsamps;
+
+  for (i=0;i<cc;i++) {	
+    /* buff[i] points to the position in tx buffer where the payload to be sent is
+       buff2 points to the position in tx buffer where the packet header will be placed */
+    void *buff2 = (void*)(buff[i]-APP_HEADER_SIZE_BYTES-MAC_HEADER_SIZE_BYTES); 
+    
+    /* we don't want to ovewrite with the header info the previous tx buffer data so we store it*/
+    struct ether_header temp =  *(struct ether_header *)buff2;
+    int32_t temp0 = *(int32_t *)(buff2 + MAC_HEADER_SIZE_BYTES);
+    openair0_timestamp  temp1 = *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t));
+    
+    bytes_sent = 0;
+    memcpy(buff2,(void*)&eh,MAC_HEADER_SIZE_BYTES);
+    *(int16_t *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int16_t))=1+(i<<1);
+    *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)) = timestamp;
+    
+    /*printf("[RRH]write mod_%d %d , len %d, buff %p \n",
+      Mod_id,eth->sockfd[Mod_id],RAW_PACKET_SIZE_BYTES(nsamps), buff2);*/
+    
+    while(bytes_sent < RAW_PACKET_SIZE_BYTES(nsamps)) {
+#if DEBUG   
+      printf("------- TX ------: buff2 current position=%d remaining_bytes=%d  bytes_sent=%d \n",
+	     (void *)(buff2+bytes_sent), 
+	     RAW_PACKET_SIZE_BYTES(nsamps) - bytes_sent,
+	     bytes_sent);
+#endif
+      /* Send packet */
+      bytes_sent += send(eth->sockfd[Mod_id],
+			   buff2, 
+			   RAW_PACKET_SIZE_BYTES(nsamps),
+			   sendto_flag);
+      if ( bytes_sent == -1) {
+	eth->num_tx_errors++;
+	perror("ETHERNET WRITE: ");
+	exit(-1);
+      } else {
+#if DEBUG
+	printf("------- TX ------: nu=%x an_id=%d ts%d bytes_sent=%d\n",
+	       *(uint8_t *)(buff2+ETH_ALEN),
+	       *(int16_t *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int16_t)),
+	       *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)),
+	       bytes_sent);
+    dump_packet((device->host_type == BBU_HOST)? "BBU":"RRH", buff2, RAW_PACKET_SIZE_BYTES(nsamps), TX_FLAG);
+#endif
+    eth->tx_actual_nsamps=bytes_sent>>2;
+    eth->tx_count++;
+      }
+    }    			    
+    
+  /* tx buffer values restored */  
+    *(struct ether_header *)buff2 = temp;
+    *(int32_t *)(buff2 + MAC_HEADER_SIZE_BYTES) = temp0;
+    *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)) = temp1;
+  }
+  return (bytes_sent-APP_HEADER_SIZE_BYTES-MAC_HEADER_SIZE_BYTES)>>2;
+}
+
+
+int trx_eth_read_raw(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc) {
+      
+  int bytes_received=0;
+  int i=0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  int Mod_id = device->Mod_id;
+  int rcvfrom_flag =0;
+  
+  eth->rx_nsamps=nsamps;
+
+  for (i=0;i<cc;i++) {
+      /* buff[i] points to the position in rx buffer where the payload to be received will be placed
+	 buff2 points to the position in rx buffer where the packet header will be placed */
+      void *buff2 = (void*)(buff[i]-APP_HEADER_SIZE_BYTES-MAC_HEADER_SIZE_BYTES); 
+      
+      /* we don't want to ovewrite with the header info the previous rx buffer data so we store it*/
+      struct ether_header temp =  *(struct ether_header *)buff2;
+      int32_t temp0 = *(int32_t *)(buff2 + MAC_HEADER_SIZE_BYTES);
+      openair0_timestamp  temp1 = *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t));
+      
+      bytes_received=0;
+      
+      while(bytes_received < RAW_PACKET_SIZE_BYTES(nsamps)) {
+	bytes_received +=recv(eth->sockfd[Mod_id],
+			      buff2,
+			      RAW_PACKET_SIZE_BYTES(nsamps),
+			      rcvfrom_flag);
+	
+	if (bytes_received ==-1) {
+	  eth->num_rx_errors++;
+	  perror("ETHERNET READ: ");
+	  exit(-1);	
+	} else {
+	  /* store the timestamp value from packet's header */
+	  *timestamp =  *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t));  
+	  eth->rx_actual_nsamps=bytes_received>>2;   
+	  eth->rx_count++;
+	}
+      }
+      
+#if DEBUG   
+      printf("------- RX------: nu=%x an_id=%d ts%d bytes_recv=%d \n",
+	     *(uint8_t *)(buff2+ETH_ALEN),
+	     *(int16_t *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int16_t)),
+	     *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)),
+	     bytes_received);
+      dump_packet((device->host_type == BBU_HOST)? "BBU":"RRH", buff2, RAW_PACKET_SIZE_BYTES(nsamps),RX_FLAG);	  
+
+#endif  
+
+     /* tx buffer values restored */  
+      *(struct ether_header *)buff2 = temp;
+      *(int32_t *)(buff2 + MAC_HEADER_SIZE_BYTES) = temp0;
+      *(openair0_timestamp *)(buff2 + MAC_HEADER_SIZE_BYTES + sizeof(int32_t)) = temp1;
+    }
+  return (bytes_received-APP_HEADER_SIZE_BYTES-MAC_HEADER_SIZE_BYTES)>>2;
+}
+
+ 
+
+
+int eth_set_dev_conf_raw(openair0_device *device) {
+
+  int 	       Mod_id = device->Mod_id;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  void 	      *msg;
+  ssize_t      msg_len;
+  
+  /* a BBU client sends to RRH a set of configuration parameters (openair0_config_t)
+     so that RF front end is configured appropriately and
+     frame/packet size etc. can be set */ 
+  
+  msg = malloc(MAC_HEADER_SIZE_BYTES + sizeof(openair0_config_t));
+  msg_len = MAC_HEADER_SIZE_BYTES + sizeof(openair0_config_t);
+
+  
+  memcpy(msg,(void*)&eh,MAC_HEADER_SIZE_BYTES);	
+  memcpy((msg+MAC_HEADER_SIZE_BYTES),(void*)device->openair0_cfg,sizeof(openair0_config_t));
+ 	  
+  if (send(eth->sockfd[Mod_id],
+	     msg,
+	     msg_len,
+	     0)==-1) {
+    perror("ETHERNET: ");
+    exit(0);
+  }
+  
+  return 0;
+}
+
+
+int eth_get_dev_conf_raw(openair0_device *device) {
+
+  eth_state_t   *eth = (eth_state_t*)device->priv;
+  int 		Mod_id = device->Mod_id;
+  char 		str[INET_ADDRSTRLEN];
+  void 		*msg;
+  ssize_t	msg_len;
+  
+  msg = malloc(MAC_HEADER_SIZE_BYTES + sizeof(openair0_config_t));
+  msg_len = MAC_HEADER_SIZE_BYTES + sizeof(openair0_config_t);
+  
+  /* RRH receives from BBU openair0_config_t */
+  if (recv(eth->sockfd[Mod_id],
+	   msg,
+	   msg_len,
+	   0)==-1) {
+    perror("ETHERNET: ");
+    exit(0);
+  }
+  
+  /* RRH stores the remote MAC address */
+  memcpy(eh.ether_dhost,(msg+ETH_ALEN),ETH_ALEN);	
+  //memcpy((void*)&device->openair0_cfg,(msg + MAC_HEADER_SIZE_BYTES), sizeof(openair0_config_t));
+  device->openair0_cfg=(openair0_config_t *)(msg + MAC_HEADER_SIZE_BYTES);
+  printf("[%s] binding mod_%d to hardware address %x:%x:%x:%x:%x:%x           hardware address %x:%x:%x:%x:%x:%x\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"),Mod_id,eh.ether_shost[0],eh.ether_shost[1],eh.ether_shost[2],eh.ether_shost[3],eh.ether_shost[4],eh.ether_shost[5],eh.ether_dhost[0],eh.ether_dhost[1],eh.ether_dhost[2],eh.ether_dhost[3],eh.ether_dhost[4],eh.ether_dhost[5]);
+ 	  
+  return 0;
+}
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
new file mode 100644
index 0000000000000000000000000000000000000000..a9706c73bdd16dad3cce786ead09bca8700b65f2
--- /dev/null
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
@@ -0,0 +1,383 @@
+/*******************************************************************************
+    OpenAirInterface
+    Copyright(c) 1999 - 2014 Eurecom
+
+    OpenAirInterface is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+
+    OpenAirInterface is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenAirInterface.The full GNU General Public License is
+    included in this distribution in the file called "COPYING". If not,
+    see <http://www.gnu.org/licenses/>.
+
+   Contact Information
+   OpenAirInterface Admin: openair_admin@eurecom.fr
+   OpenAirInterface Tech : openair_tech@eurecom.fr
+   OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
+
+   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+
+ *******************************************************************************/
+/*! \file ethernet_lib.c 
+ * \brief API to stream I/Q samples over standard ethernet
+ * \author  add alcatel Katerina Trilyraki, Navid Nikaein, Pedro Dinis, Lucio Ferreira, Raymond Knopp
+ * \date 2015
+ * \version 0.2
+ * \company Eurecom
+ * \maintainer:  navid.nikaein@eurecom.fr
+ * \note
+ * \warning 
+ */
+
+#include <arpa/inet.h>
+#include <linux/if_packet.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/ether.h>
+#include <unistd.h>
+#include <errno.h>
+#include "vcd_signal_dumper.h"
+
+#include "common_lib.h"
+#include "ethernet_lib.h"
+
+#define DEBUG 0
+struct sockaddr_in dest_addr[MAX_INST];
+struct sockaddr_in local_addr[MAX_INST];
+int addr_len[MAX_INST];
+
+
+uint16_t pck_seq_num = 1;
+uint16_t pck_seq_num_cur=0;
+uint16_t pck_seq_num_prev=0;
+
+ int eth_socket_init_udp(openair0_device *device) {
+
+  int i = 0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  int Mod_id = device->Mod_id;  
+  char str_local[INET_ADDRSTRLEN];
+  char str_remote[INET_ADDRSTRLEN];
+  const char *local_ip, *remote_ip;
+  int local_port=0, remote_port=0;
+  int sock_dom=0;
+  int sock_type=0;
+  int sock_proto=0;
+  int enable=1;
+
+  if (device->host_type == RRH_HOST ) {
+    local_ip   = device->openair0_cfg->my_addr;   
+    local_port = device->openair0_cfg->my_port;
+    remote_ip   = "0.0.0.0";   
+    remote_port =  0;   
+    printf("[%s] local ip addr %s port %d\n", "RRH", local_ip, local_port);    
+  } else {
+    local_ip   = device->openair0_cfg->my_addr;   
+    local_port = device->openair0_cfg->my_port;
+    remote_ip   = device->openair0_cfg->remote_addr;
+    remote_port = device->openair0_cfg->remote_port;  
+    printf("[%s] local ip addr %s port %d\n","BBU", local_ip, local_port);    
+  }
+  
+  /* Open socket to send on */
+  sock_dom=AF_INET;
+  sock_type=SOCK_DGRAM;
+  sock_proto=IPPROTO_UDP;
+  
+  if ((eth->sockfd[Mod_id] = socket(sock_dom, sock_type, sock_proto)) == -1) {
+    perror("ETHERNET: Error opening socket");
+    exit(0);
+  }
+  
+  /* initialize addresses */
+  for (i=0; i< MAX_INST; i++) {
+    bzero((void *)&(dest_addr[i]), sizeof(dest_addr[i]));
+    bzero((void *)&(local_addr[i]), sizeof(local_addr[i]));
+  }
+
+  addr_len[Mod_id] = sizeof(struct sockaddr_in);
+
+  dest_addr[Mod_id].sin_family = AF_INET;
+  inet_pton(AF_INET,remote_ip,&(dest_addr[Mod_id].sin_addr.s_addr));
+  dest_addr[Mod_id].sin_port=htons(remote_port);
+  inet_ntop(AF_INET, &(dest_addr[Mod_id].sin_addr), str_remote, INET_ADDRSTRLEN);
+
+
+  local_addr[Mod_id].sin_family = AF_INET;
+  inet_pton(AF_INET,local_ip,&(local_addr[Mod_id].sin_addr.s_addr));
+  local_addr[Mod_id].sin_port=htons(local_port);
+  inet_ntop(AF_INET, &(local_addr[Mod_id].sin_addr), str_local, INET_ADDRSTRLEN);
+
+  
+  /* set reuse address flag */
+  if (setsockopt(eth->sockfd[Mod_id], SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int))) {
+    perror("ETHERNET: Cannot set SO_REUSEADDR option on socket");
+    exit(0);
+  }
+  
+  /* want to receive -> so bind */   
+    if (bind(eth->sockfd[Mod_id],(struct sockaddr *)&local_addr[Mod_id],addr_len[Mod_id])<0) {
+      perror("ETHERNET: Cannot bind to socket");
+      exit(0);
+    } else {
+      printf("[%s] binding mod_%d to %s:%d\n","RRH",Mod_id,str_local,ntohs(local_addr[Mod_id].sin_port));
+    }
+ 
+  return 0;
+}
+
+int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags) {	
+  
+  int bytes_sent=0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  int Mod_id = device->Mod_id;
+  int sendto_flag =0;
+  int i=0;
+  //sendto_flag|=flags;
+  eth->tx_nsamps=nsamps;
+
+  for (i=0;i<cc;i++) {	
+    /* buff[i] points to the position in tx buffer where the payload to be sent is
+       buff2 points to the position in tx buffer where the packet header will be placed */
+    void *buff2 = (void*)(buff[i]- APP_HEADER_SIZE_BYTES); 
+    
+    /* we don't want to ovewrite with the header info the previous tx buffer data so we store it*/
+    int32_t temp0 = *(int32_t *)buff2;
+    openair0_timestamp  temp1 = *(openair0_timestamp *)(buff2 + sizeof(int32_t));
+    
+    bytes_sent = 0;
+    
+    /* constract application header */
+    // eth->pck_header.seq_num = pck_seq_num;
+    //eth->pck_header.antenna_id = 1+(i<<1);
+    //eth->pck_header.timestamp = timestamp;
+    *(uint16_t *)buff2 = pck_seq_num;
+    *(uint16_t *)(buff2 + sizeof(uint16_t)) = 1+(i<<1);
+    *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = timestamp;
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TX_SEQ_NUM, pck_seq_num);
+
+    while(bytes_sent < UDP_PACKET_SIZE_BYTES(nsamps)) {
+#if DEBUG   
+      printf("------- TX ------: buff2 current position=%d remaining_bytes=%d  bytes_sent=%d \n",
+	     (void *)(buff2+bytes_sent), 
+	     UDP_PACKET_SIZE_BYTES(nsamps) - bytes_sent,
+	     bytes_sent);
+#endif
+      /* Send packet */
+      bytes_sent += sendto(eth->sockfd[Mod_id],
+			   buff2, 
+                           UDP_PACKET_SIZE_BYTES(nsamps),
+			   sendto_flag,
+			   (struct sockaddr*)&dest_addr[Mod_id],
+			   addr_len[Mod_id]);
+      
+      if ( bytes_sent == -1) {
+	eth->num_tx_errors++;
+	perror("ETHERNET WRITE: ");
+	exit(-1);
+      } else {
+#if DEBUG
+    printf("------- TX ------: nu=%d an_id=%d ts%d bytes_send=%d\n",
+	   *(int16_t *)buff2,
+	   *(int16_t *)(buff2 + sizeof(int16_t)),
+	   *(openair0_timestamp *)(buff2 + sizeof(int32_t)),
+	   bytes_sent);
+    dump_packet((device->host_type == BBU_HOST)? "BBU":"RRH", buff2, UDP_PACKET_SIZE_BYTES(nsamps), TX_FLAG);
+#endif
+    eth->tx_actual_nsamps=bytes_sent>>2;
+    eth->tx_count++;
+    pck_seq_num++;
+    if ( pck_seq_num > MAX_PACKET_SEQ_NUM(nsamps,76800) )  pck_seq_num = 1;
+      }
+    }              
+      /* tx buffer values restored */  
+      *(int32_t *)buff2 = temp0;
+      *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = temp1;
+  }
+ 
+  return (bytes_sent-APP_HEADER_SIZE_BYTES)>>2;
+}
+      
+
+
+int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc) {
+  
+  int bytes_received=0;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  openair0_timestamp prev_timestamp = -1;
+  int Mod_id = device->Mod_id;
+  int rcvfrom_flag =0;
+  int block_cnt=0;
+  int again_cnt=0;
+  int i=0;
+
+  eth->rx_nsamps=nsamps;
+
+  for (i=0;i<cc;i++) {
+    /* buff[i] points to the position in rx buffer where the payload to be received will be placed
+       buff2 points to the position in rx buffer where the packet header will be placed */
+    void *buff2 = (void*)(buff[i]- APP_HEADER_SIZE_BYTES);
+    
+    /* we don't want to ovewrite with the header info the previous rx buffer data so we store it*/
+    int32_t temp0 = *(int32_t *)buff2;
+    openair0_timestamp temp1 = *(openair0_timestamp *)(buff2 + sizeof(int32_t));
+    
+    bytes_received=0;
+    block_cnt=0;
+    
+    
+    while(bytes_received < UDP_PACKET_SIZE_BYTES(nsamps)) {
+    again:
+#if DEBUG   
+	   printf("------- RX------: buff2 current position=%d remaining_bytes=%d  bytes_recv=%d \n",
+		  (void *)(buff2+bytes_received),
+		  UDP_PACKET_SIZE_BYTES(nsamps) - bytes_received,
+		  bytes_received);
+#endif
+      bytes_received +=recvfrom(eth->sockfd[Mod_id],
+				buff2,
+	                        UDP_PACKET_SIZE_BYTES(nsamps),
+				rcvfrom_flag,
+				(struct sockaddr *)&dest_addr[Mod_id],
+				(socklen_t *)&addr_len[Mod_id]);
+      
+      if (bytes_received ==-1) {
+	eth->num_rx_errors++;
+	if (errno == EAGAIN) {
+	  again_cnt++;
+	  usleep(10);
+	  if (again_cnt == 1000) {
+	  perror("ETHERNET READ: ");
+	  exit(-1);
+	  } else {
+	    printf("AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN \n");
+	    goto again;
+	  }	  
+	} else if (errno == EWOULDBLOCK) {
+	     block_cnt++;
+	     usleep(10);	  
+	     if (block_cnt == 1000) {
+      perror("ETHERNET READ: ");
+      exit(-1);
+    } else {
+	    printf("BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK \n");
+	    goto again;
+	  }
+	}
+      } else {
+#if DEBUG   
+	   printf("------- RX------: nu=%d an_id=%d ts%d bytes_recv=%d\n",
+		  *(int16_t *)buff2,
+		  *(int16_t *)(buff2 + sizeof(int16_t)),
+		  *(openair0_timestamp *)(buff2 + sizeof(int32_t)),
+		  bytes_received);
+	   dump_packet((device->host_type == BBU_HOST)? "BBU":"RRH", buff2, UDP_PACKET_SIZE_BYTES(nsamps),RX_FLAG);	  
+#endif  
+	   
+	   /* store the timestamp value from packet's header */
+	   *timestamp =  *(openair0_timestamp *)(buff2 + sizeof(int32_t));
+	   /* store the sequence number of the previous packet received */    
+	   if (pck_seq_num_cur == 0) {
+	     pck_seq_num_prev = *(uint16_t *)buff2;
+	   } else {
+	     pck_seq_num_prev = pck_seq_num_cur;
+	   }
+	   /* get the packet sequence number from packet's header */
+	   pck_seq_num_cur = *(uint16_t *)buff2;
+	   //printf("cur=%d prev=%d buff=%d\n",pck_seq_num_cur,pck_seq_num_prev,*(uint16_t *)(buff2));
+	   if ( ( pck_seq_num_cur != (pck_seq_num_prev + 1) ) && !((pck_seq_num_prev==75) && (pck_seq_num_cur==1 ))){
+	     printf("out of order packet received1! %d|%d|%d\n",pck_seq_num_cur,pck_seq_num_prev,	*timestamp);
+	   }
+	   VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RX_SEQ_NUM,pck_seq_num_cur);
+	   VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RX_SEQ_NUM_PRV,pck_seq_num_prev);
+						    eth->rx_actual_nsamps=bytes_received>>2;
+						    eth->rx_count++;
+						    }	 
+	     
+      }
+      /* tx buffer values restored */  
+      *(int32_t *)buff2 = temp0;
+      *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = temp1;
+	  
+    }      
+  return (bytes_received-APP_HEADER_SIZE_BYTES)>>2;
+}
+      
+
+
+
+int eth_set_dev_conf_udp(openair0_device *device) {
+
+  int 	       Mod_id = device->Mod_id;
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  void 	      *msg;
+  ssize_t      msg_len;
+
+  
+  /* a BBU client sents to RRH a set of configuration parameters (openair0_config_t)
+     so that RF front end is configured appropriately and
+     frame/packet size etc. can be set */ 
+
+  msg=malloc(sizeof(openair0_config_t));
+  msg_len=sizeof(openair0_config_t);
+  memcpy(msg,(void*)device->openair0_cfg,msg_len);	
+  
+  if (sendto(eth->sockfd[Mod_id],msg,msg_len,0,(struct sockaddr *)&dest_addr[Mod_id],addr_len[Mod_id])==-1) {
+    perror("ETHERNET: ");
+    exit(0);
+  }
+
+  return 0;
+}
+
+int eth_get_dev_conf_udp(openair0_device *device) {
+
+  eth_state_t   *eth = (eth_state_t*)device->priv;
+  int 		Mod_id = device->Mod_id;
+  char 		str1[INET_ADDRSTRLEN],str[INET_ADDRSTRLEN];
+  void 		*msg;
+  ssize_t	msg_len;
+  
+  msg=malloc(sizeof(openair0_config_t));
+  msg_len=sizeof(openair0_config_t);
+
+  inet_ntop(AF_INET, &(local_addr[Mod_id].sin_addr), str, INET_ADDRSTRLEN);
+  inet_ntop(AF_INET, &(dest_addr[Mod_id].sin_addr), str1, INET_ADDRSTRLEN);
+
+  /* RRH receives from BBU openair0_config_t */
+  if (recvfrom(eth->sockfd[Mod_id],
+	       msg,
+	       msg_len,
+	       0,
+	       (struct sockaddr *)&dest_addr[Mod_id],
+	       (socklen_t *)&addr_len[Mod_id])==-1) {
+    perror("ETHERNET: ");
+    exit(0);
+  }
+  device->openair0_cfg=(openair0_config_t *)msg;
+
+   /* get remote ip address and port */
+   /* inet_ntop(AF_INET, &(dest_addr[Mod_id].sin_addr), str1, INET_ADDRSTRLEN); */
+   /* device->openair0_cfg->remote_port =ntohs(dest_addr[Mod_id].sin_port); */
+   /* device->openair0_cfg->remote_addr =str1; */
+
+   /* /\* restore local ip address and port *\/ */
+   /* inet_ntop(AF_INET, &(local_addr[Mod_id].sin_addr), str, INET_ADDRSTRLEN); */
+   /* device->openair0_cfg->my_port =ntohs(local_addr[Mod_id].sin_port); */
+   /* device->openair0_cfg->my_addr =str; */
+
+   /*  printf("[RRH] mod_%d socket %d connected to BBU %s:%d  %s:%d\n", Mod_id, eth->sockfd[Mod_id],str1, device->openair0_cfg->remote_port, str, device->openair0_cfg->my_port);  */
+   return 0;
+}
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index ce90d2cff967e03d90d3c82bc401f3b93a156768..f15f2d98ebcabf715273fe03256319358d63b825 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -28,7 +28,7 @@
  *******************************************************************************/
 /*! \file ethernet_lib.c 
  * \brief API to stream I/Q samples over standard ethernet
- * \author Katerina Trilyraki, Navid Nikaein, Pedro Dinis, Lucio Ferreira, Raymond Knopp
+ * \author  add alcatel Katerina Trilyraki, Navid Nikaein, Pedro Dinis, Lucio Ferreira, Raymond Knopp
  * \date 2015
  * \version 0.2
  * \company Eurecom
@@ -52,196 +52,56 @@
 #include "common_lib.h"
 #include "ethernet_lib.h"
 
-//#define DEBUG 1
 
 int num_devices_eth = 0;
+struct sockaddr_in dest_addr[MAX_INST];
 int dest_addr_len[MAX_INST];
-char sendbuf[MAX_INST][BUF_SIZ]; /*TODO*/
-
-
-/*! \fn static int eth_socket_init(openair0_device *device)
-* \brief initialization of UDP Socket to communicate with one destination
-* \param[in] *device openair device for which the socket will be created
-* \param[out]
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
-static int eth_socket_init(openair0_device *device);
-
-/*! \fn static int eth_set_dev_conf(openair0_device *device)
-* \brief 
-* \param[in] *device openair device 
-* \param[out]
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
-static int eth_set_dev_conf(openair0_device *device);
-
-/*! \fn static int eth_get_dev_conf(openair0_device *device)
-* \brief
-* \param[in] *device openair device
-* \param[out]
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
-static int eth_get_dev_conf(openair0_device *device);
-
 
 
 int trx_eth_start(openair0_device *device) {
-  
-  /* initialize socket */
-  if (eth_socket_init(device)!=0) {
-    return -1;
-  }
-  
-  /* RRH gets openair0 device configuration BBU sets openair0 device configuration*/
-  if (device->func_type == BBU_FUNC) {
-    return eth_set_dev_conf(device);
-  } else {
-    return eth_get_dev_conf(device);
-  }
-
-  return 0;
-}
 
-
-int trx_eth_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags) {	
-  
-  int n_written=0,i;
-  uint16_t header_size=sizeof(int32_t) + sizeof(openair0_timestamp);
   eth_state_t *eth = (eth_state_t*)device->priv;
-  int Mod_id = device->Mod_id;
-  int sendto_flag =0;
-  sendto_flag|=MSG_DONTWAIT;
   
-  for (i=0;i<cc;i++) {	
-    /* buff[i] points to the position in tx buffer where the payload to be sent is
-       buff2 points to the position in tx buffer where the packet header will be placed */
-    void *buff2 = (void*)(buff[i]-header_size); 
-    
-    /* we don't want to ovewrite with the header info the previous tx buffer data so we store it*/
-    int32_t temp0 = *(int32_t *)buff2;
-    openair0_timestamp  temp1 = *(openair0_timestamp *)(buff2 + sizeof(int32_t));
-    
-    n_written = 0;
-    
-    *(int16_t *)(buff2 + sizeof(int16_t))=1+(i<<1);
-    *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = timestamp;
-    
-    /* printf("[RRH]write mod_%d %d , len %d, buff %p antenna %d\n",
-       Mod_id,eth->sockfd[Mod_id],(nsamps<<2)+header_size, buff2, antenna_id);*/
-    
-    while(n_written < nsamps) {
-      /* Send packet */
-      if ((n_written += sendto(eth->sockfd[Mod_id],
-			       buff2, 
-			       (nsamps<<2)+header_size,
-			       0,
-			       (struct sockaddr*)&eth->dest_addr[Mod_id],
-			       dest_addr_len[Mod_id])) < 0) {
-	perror("ETHERNET WRITE");
-	exit(-1);
-      }
+  /* initialize socket */
+  if ((eth->flags & ETH_RAW_MODE) != 0 ) {     
+    if (eth_socket_init_raw(device)!=0)   return -1;
+    /* RRH gets openair0 device configuration - BBU sets openair0 device configuration*/
+    if (device->host_type == BBU_HOST) {
+      if(eth_set_dev_conf_raw(device)!=0)  return -1;
+    } else {
+      if(eth_get_dev_conf_raw(device)!=0)  return -1;
     }
-
-#if DEBUG
-    printf("Buffer head TX: nu=%d an_id=%d ts%d samples_send=%d i=%d data=%x\n",
-	   *(int16_t *)buff2,
-	   *(int16_t *)(buff2 + sizeof(int16_t)),
-	   *(openair0_timestamp *)(buff2 + sizeof(int32_t)),
-	   n_written>>2,i,*(int32_t *)(buff2 + 20*sizeof(int32_t)));
-#endif
-
-    /* tx buffer values restored */  
-    *(int32_t *)buff2 = temp0;
-    *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = temp1;
-  }
-  return n_written;
-  
-}
-
-int trx_eth_read(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc) {
-
-  int bytes_received=0;
-  int block_cnt=0;
-  int ret=0,i;
-  uint16_t  header_size=sizeof(int32_t) + sizeof(openair0_timestamp);
-
-  eth_state_t *eth = (eth_state_t*)device->priv;
-  int Mod_id = device->Mod_id;
-  
-  for (i=0;i<cc;i++) {
-    /* buff[i] points to the position in rx buffer where the payload to be received will be placed
-       buff2 points to the position in rx buffer where the packet header will be placed */
-    void *buff2 = (void*)(buff[i]-header_size);
-    
-    /* we don't want to ovewrite with the header info the previous rx buffer data so we store it*/
-    int32_t temp0 = *(int32_t *)buff2;
-    openair0_timestamp temp1 = *(openair0_timestamp *)(buff2 + sizeof(int32_t));
-    
-    bytes_received=0;
-    block_cnt=0;
-    ret=0;
-    
-    /* printf("[RRH] read mod_%d %d,len %d, buff %p antenna %d\n",
-       Mod_id,eth->sockfd[Mod_id],(nsamps<<2)+header_size, buff2, antenna_id);*/
-    
-    while(bytes_received < (int)((nsamps<<2))) {
-      ret=recvfrom(eth->sockfd[Mod_id],
-		   buff2+bytes_received,
-		   (nsamps<<2)+header_size-bytes_received,
-		   0,//MSG_DONTWAIT,
-                 (struct sockaddr *)&eth->dest_addr[Mod_id],
-		   (socklen_t *)&dest_addr_len[Mod_id]);
-      
-      if (ret==-1) {
-	if (errno == EAGAIN) {
-	  perror("ETHERNET READ: ");
-	  return((nsamps<<2) + header_size);
-	} else if (errno == EWOULDBLOCK) {
-	  block_cnt++;
-	  usleep(10);
-	  
-	  if (block_cnt == 100) return(-1);
-	}
-      } else {
-	bytes_received+=ret;
-      }
+    /* adjust MTU wrt number of samples per packet */
+    if(ethernet_tune (device,MTU_SIZE,RAW_PACKET_SIZE_BYTES(device->openair0_cfg->samples_per_packet))!=0)  return -1;
+  } else {
+    if (eth_socket_init_udp(device)!=0)   return -1; 
+    /* RRH gets openair0 device configuration - BBU sets openair0 device configuration*/
+    if (device->host_type == BBU_HOST) {
+      if(eth_set_dev_conf_udp(device)!=0)  return -1;
+    } else {
+      if(eth_get_dev_conf_udp(device)!=0)  return -1;
     }
-
-#if DEBUG   
-    printf("Buffer head RX: nu=%d an_id=%d ts%d samples_recv=%d i=%d data=%x\n",
-	   *(int16_t *)buff2,
-	   *(int16_t *)(buff2 + sizeof(int16_t)),
-	   *(openair0_timestamp *)(buff2 + sizeof(int32_t)),
-	   ret>>2,i,*(int32_t *)(buff2 + 20*sizeof(int32_t)));
-#endif  
-
-    /* store the timestamp value from packet's header */
-    *timestamp =  *(openair0_timestamp *)(buff2 + sizeof(int32_t));
-    
-    /* tx buffer values restored */  
-    *(int32_t *)buff2 = temp0;
-    *(openair0_timestamp *)(buff2 + sizeof(int32_t)) = temp1;
+    /* adjust MTU wrt number of samples per packet */
+    //if(ethernet_tune (device,MTU_SIZE,UDP_PACKET_SIZE_BYTES(device->openair0_cfg->samples_per_packet))!=0)  return -1;
   }
-  return nsamps;
+  /* apply additional configuration */
+  if(ethernet_tune (device, SND_BUF_SIZE,2000000000)!=0)  return -1;
+  if(ethernet_tune (device, RCV_BUF_SIZE,2000000000)!=0)  return -1;
   
+  return 0;
 }
 
+
 void trx_eth_end(openair0_device *device) {
 
   eth_state_t *eth = (eth_state_t*)device->priv;
   int Mod_id = device->Mod_id;
-  /*destroys socket only for the processes that call the eth_end fuction-- shutdown() for beaking the pipe */
+  /* destroys socket only for the processes that call the eth_end fuction-- shutdown() for beaking the pipe */
   if ( close(eth->sockfd[Mod_id]) <0 ) {
     perror("ETHERNET: Failed to close socket");
     exit(0);
    } else {
-    printf("[RRH] socket for mod_id %d has been successfully closed.\n",Mod_id);
+    printf("[%s] socket for mod_id %d has been successfully closed.\n",(device->host_type == BBU_HOST)? "BBU":"RRH",Mod_id);
    }
  
 }
@@ -253,7 +113,7 @@ int trx_eth_request(openair0_device *device, void *msg, ssize_t msg_len) {
   eth_state_t *eth = (eth_state_t*)device->priv;
  
   /* BBU sends a message to RRH */
- if (sendto(eth->sockfd[Mod_id],msg,msg_len,0,(struct sockaddr *)&eth->dest_addr[Mod_id],dest_addr_len[Mod_id])==-1) {
+ if (sendto(eth->sockfd[Mod_id],msg,msg_len,0,(struct sockaddr *)&dest_addr[Mod_id],dest_addr_len[Mod_id])==-1) {
     perror("ETHERNET: ");
     exit(0);
   }
@@ -262,7 +122,6 @@ int trx_eth_request(openair0_device *device, void *msg, ssize_t msg_len) {
 }
 
 
-
 int trx_eth_reply(openair0_device *device, void *msg, ssize_t msg_len) {
 
   eth_state_t   *eth = (eth_state_t*)device->priv;
@@ -273,7 +132,7 @@ int trx_eth_reply(openair0_device *device, void *msg, ssize_t msg_len) {
 	       msg,
 	       msg_len,
 	       0,
-	       (struct sockaddr *)&eth->dest_addr[Mod_id],
+	       (struct sockaddr *)&dest_addr[Mod_id],
 	       (socklen_t *)&dest_addr_len[Mod_id])==-1) {
     perror("ETHERNET: ");
     exit(0);
@@ -283,65 +142,6 @@ int trx_eth_reply(openair0_device *device, void *msg, ssize_t msg_len) {
 }
 
 
-static int eth_set_dev_conf(openair0_device *device) {
-
-  int 	       Mod_id = device->Mod_id;
-  eth_state_t *eth = (eth_state_t*)device->priv;
-  void 	      *msg;
-  ssize_t      msg_len;
-
-  
-  /* a BBU client sents to RRH a set of configuration parameters (openair0_config_t)
-     so that RF front end is configured appropriately and
-     frame/packet size etc. can be set */ 
-  
-  msg=malloc(sizeof(openair0_config_t));
-  msg_len=sizeof(openair0_config_t);
-  memcpy(msg,(void*)&device->openair0_cfg,msg_len);	
-  
-  if (sendto(eth->sockfd[Mod_id],msg,msg_len,0,(struct sockaddr *)&eth->dest_addr[Mod_id],dest_addr_len[Mod_id])==-1) {
-    perror("ETHERNET: ");
-    exit(0);
-  }
-     
-  return 0;
-}
-
-
-static int eth_get_dev_conf(openair0_device *device) {
-
-  eth_state_t   *eth = (eth_state_t*)device->priv;
-  int 		Mod_id = device->Mod_id;
-  char 		str[INET_ADDRSTRLEN];
-  void 		*msg;
-  ssize_t	msg_len;
-  
-  msg=malloc(sizeof(openair0_config_t));
-  msg_len=sizeof(openair0_config_t);
-
-  /* RRH receives from BBU openair0_config_t */
-  if (recvfrom(eth->sockfd[Mod_id],
-	       msg,
-	       msg_len,
-	       0,
-	       (struct sockaddr *)&eth->dest_addr[Mod_id],
-	       (socklen_t *)&dest_addr_len[Mod_id])==-1) {
-    perror("ETHERNET: ");
-    exit(0);
-  }
-		
-   memcpy((void*)&device->openair0_cfg,msg,msg_len);	
-   inet_ntop(AF_INET, &(eth->dest_addr[Mod_id].sin_addr), str, INET_ADDRSTRLEN);
-   device->openair0_cfg.remote_port =ntohs(eth->dest_addr[Mod_id].sin_port);
-   device->openair0_cfg.remote_ip=str;
-   /*apply additional configuration*/
-   //ethernet_tune (device, RING_PAR);
-   // printf("[RRH] write mod_%d %d to %s:%d\n",Mod_id,eth->sockfd[Mod_id],str,ntohs(eth->dest_addr[Mod_id].sin_port));
-
-   return 0;
-}
-
-
 
 int trx_eth_stop(int card) {
   return(0);
@@ -364,186 +164,307 @@ int trx_eth_reset_stats(openair0_device* device) {
 }
 
 
-static int eth_socket_init(openair0_device *device) {
-
-  int i = 0;
-  eth_state_t *eth = (eth_state_t*)device->priv;
-  int Mod_id = device->Mod_id;  
-  char str[INET_ADDRSTRLEN];
-  const char *dest_ip;
-  int dest_port=0;
-  
-  if (device->func_type == RRH_FUNC ) {
-    dest_ip   = device->openair0_cfg.my_ip;   
-    dest_port = device->openair0_cfg.my_port;
-    printf("[RRH] ip addr %s port %d\n",dest_ip, dest_port);
-  } else {
-    dest_ip   = device->openair0_cfg.remote_ip;
-    dest_port = device->openair0_cfg.remote_port;
-    printf("[BBU] ip addr %s port %d\n",dest_ip, dest_port);
-  }
-    
-  /* Open RAW socket to send on */
-  if ((eth->sockfd[Mod_id] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
-    perror("ETHERNET: Error opening socket");
-    exit(0);
-  }
-
-  /* initialize destination address */
-  for (i=0; i< MAX_INST; i++) {
-    bzero((void *)&(eth->dest_addr[i]), sizeof(eth->dest_addr[i]));
-  }
-
- // bzero((void *)dest,sizeof(struct sockaddr_in));
-  eth->dest_addr[Mod_id].sin_family = AF_INET;
-  inet_pton(AF_INET,dest_ip,&(eth->dest_addr[Mod_id].sin_addr.s_addr));
-  eth->dest_addr[Mod_id].sin_port=htons(dest_port);
-  dest_addr_len[Mod_id] = sizeof(struct sockaddr_in);
-  inet_ntop(AF_INET, &(eth->dest_addr[Mod_id].sin_addr), str, INET_ADDRSTRLEN);
-  
-  /* if RRH, then I am the server, so bind */
-  if (device->func_type == RRH_FUNC ) {    
-    if (bind(eth->sockfd[Mod_id],(struct sockaddr *)&eth->dest_addr[Mod_id], dest_addr_len[Mod_id])<0) {
-      perror("ETHERNET: Cannot bind to socket");
-      exit(0);
-    } else {
-      printf("[RRH] binding mod_%d to %s:%d\n",Mod_id,str,ntohs(eth->dest_addr[Mod_id].sin_port));
-    }
-    
-  } else {
-    printf("[BBU] Connecting to %s:%d\n",str,ntohs(eth->dest_addr[Mod_id].sin_port));
-  }
-  
-  return 0;
-}
-
-
-int ethernet_tune(openair0_device *device , eth_opt_t option) {
+int ethernet_tune(openair0_device *device, unsigned int option, int value) {
   
   eth_state_t *eth = (eth_state_t*)device->priv;
   int Mod_id=device->Mod_id;
-  
-  unsigned int sndbuf_size=0, rcvbuf_size=0;
-  struct timeval snd_timeout, rcv_timeout;
+  struct timeval timeout;
   struct ifreq ifr;   
   char system_cmd[256]; 
   char* if_name=DEFAULT_IF;
-
-  /****************** socket level options ************************/
-  if (option== SND_BUF_SIZE) {    /* transmit socket buffer size */   
+  struct in_addr ia;
+  struct if_nameindex *ids;
+  int ret=0;
+  int i=0;
+  
+  /****************** socket level options ************************/  
+  switch(option) {
+  case SND_BUF_SIZE:  /* transmit socket buffer size */   
     if (setsockopt(eth->sockfd[Mod_id],  
 		   SOL_SOCKET,  
 		   SO_SNDBUF,  
-		   &sndbuf_size,sizeof(sndbuf_size))) {
+		   &value,sizeof(value))) {
       perror("[ETHERNET] setsockopt()");
     } else {
-      printf( "sndbuf_size= %d bytes\n", sndbuf_size); 
-    }     
-  } else if (option== RCV_BUF_SIZE) {  /* receive socket buffer size */   
+      printf("send buffer size= %d bytes\n",value); 
+    }   
+    break;
+    
+  case RCV_BUF_SIZE:   /* receive socket buffer size */   
     if (setsockopt(eth->sockfd[Mod_id],  
 		   SOL_SOCKET,  
 		   SO_RCVBUF,  
-		   &rcvbuf_size,sizeof(rcvbuf_size))) {
+		   &value,sizeof(value))) {
       perror("[ETHERNET] setsockopt()");
     } else {     
-      printf( "rcvbuf_size= %d bytes\n", rcvbuf_size);    
+      printf("receive bufffer size= %d bytes\n",value);    
     }
-  } else if (option==RCV_TIMEOUT) {
-    rcv_timeout.tv_sec = 0;
-    rcv_timeout.tv_usec = 180;//less than rt_period
+    break;
+    
+  case RCV_TIMEOUT:
+    timeout.tv_sec = value/1000000000;
+    timeout.tv_usec = value%1000000000;//less than rt_period?
     if (setsockopt(eth->sockfd[Mod_id],  
 		   SOL_SOCKET,  
 		   SO_RCVTIMEO,  
-		   (char *)&rcv_timeout,sizeof(rcv_timeout))) {
+		   (char *)&timeout,sizeof(timeout))) {
       perror("[ETHERNET] setsockopt()");  
     } else {   
-      printf( "rcv_timeout= %d usecs\n", rcv_timeout.tv_usec);  
+      printf( "receive timeout= %d,%d sec\n",timeout.tv_sec,timeout.tv_usec);  
     }  
-  } else if (option==SND_TIMEOUT) {
-    snd_timeout.tv_sec = 0;
-    snd_timeout.tv_usec = 180;//less than rt_period
+    break;
+    
+  case SND_TIMEOUT:
+    timeout.tv_sec = value/1000000000;
+    timeout.tv_usec = value%1000000000;//less than rt_period?
     if (setsockopt(eth->sockfd[Mod_id],  
 		   SOL_SOCKET,  
 		   SO_SNDTIMEO,  
-		   (char *)&snd_timeout,sizeof(snd_timeout))) {
+		   (char *)&timeout,sizeof(timeout))) {
       perror("[ETHERNET] setsockopt()");     
     } else {
-      printf( "snd_timeout= %d usecs\n", snd_timeout.tv_usec);    
+      printf( "send timeout= %d,%d sec\n",timeout.tv_sec,timeout.tv_usec);    
     }
-  }
-  
-  /******************* interface level options  *************************/
-  else if (option==MTU_SIZE) {    /* change  MTU of the eth interface */ 
+    break;
+    
+    
+    /******************* interface level options  *************************/
+  case MTU_SIZE: /* change  MTU of the eth interface */ 
     ifr.ifr_addr.sa_family = AF_INET;
-    strncpy(ifr.ifr_name,if_name, sizeof(ifr.ifr_name));
-    ifr.ifr_mtu =8960;
+    strncpy(ifr.ifr_name,eth->if_name[Mod_id], sizeof(ifr.ifr_name));
+    ifr.ifr_mtu =value;
     if (ioctl(eth->sockfd[Mod_id],SIOCSIFMTU,(caddr_t)&ifr) < 0 )
       perror ("[ETHERNET] Can't set the MTU");
     else 
-      printf("[ETHERNET] %s MTU size has changed to %d\n",DEFAULT_IF,ifr.ifr_mtu);
-  } else if (option==TX_Q_LEN) {    /* change TX queue length of eth interface */ 
+      printf("[ETHERNET] %s MTU size has changed to %d\n",eth->if_name[Mod_id],ifr.ifr_mtu);
+    break;
+    
+  case TX_Q_LEN:  /* change TX queue length of eth interface */ 
     ifr.ifr_addr.sa_family = AF_INET;
-    strncpy(ifr.ifr_name,if_name, sizeof(ifr.ifr_name));
-    ifr.ifr_qlen =3000 ;
+    strncpy(ifr.ifr_name,eth->if_name[Mod_id], sizeof(ifr.ifr_name));
+    ifr.ifr_qlen =value;
     if (ioctl(eth->sockfd[Mod_id],SIOCSIFTXQLEN,(caddr_t)&ifr) < 0 )
       perror ("[ETHERNET] Can't set the txqueuelen");
     else 
-      printf("[ETHERNET] %s txqueuelen size has changed to %d\n",DEFAULT_IF,ifr.ifr_qlen);
-
-
+      printf("[ETHERNET] %s txqueuelen size has changed to %d\n",eth->if_name[Mod_id],ifr.ifr_qlen);
+    break;
+    
     /******************* device level options  *************************/
-  } else if (option==COALESCE_PAR) {  
-    if (snprintf(system_cmd,sizeof(system_cmd),"ethtool -C %s rx-usecs 3",DEFAULT_IF) > 0) {
-      system(system_cmd);
+  case COALESCE_PAR:
+    ret=snprintf(system_cmd,sizeof(system_cmd),"ethtool -C %s rx-usecs %d",eth->if_name[Mod_id],value);
+    if (ret > 0) {
+      ret=system(system_cmd);
+      if (ret == -1) {
+	fprintf (stderr,"[ETHERNET] Can't start shell to execute %s %s",system_cmd, strerror(errno));
+      } else {
+	printf ("[ETHERNET] status of %s is %i\n",WEXITSTATUS(ret));
+      }
       printf("[ETHERNET] Coalesce parameters %s\n",system_cmd);
     } else {
       perror("[ETHERNET] Can't set coalesce parameters\n");
     }
+    break;
     
-  } else if (option==PAUSE_PAR ) {  
-    if (snprintf(system_cmd,sizeof(system_cmd),"ethtool -A %s autoneg off rx off tx off",DEFAULT_IF) > 0) {
-      system(system_cmd);
+  case PAUSE_PAR:
+    if (value==1) ret=snprintf(system_cmd,sizeof(system_cmd),"ethtool -A %s autoneg off rx off tx off",eth->if_name[Mod_id]);
+    else if (value==0) ret=snprintf(system_cmd,sizeof(system_cmd),"ethtool -A %s autoneg on rx on tx on",eth->if_name[Mod_id]);
+    else break;
+    if (ret > 0) {
+      ret=system(system_cmd);
+      if (ret == -1) {
+	fprintf (stderr,"[ETHERNET] Can't start shell to execute %s %s",system_cmd, strerror(errno));
+      } else {
+	printf ("[ETHERNET] status of %s is %i\n",WEXITSTATUS(ret));
+      }
       printf("[ETHERNET] Pause parameters %s\n",system_cmd);
     } else {
       perror("[ETHERNET] Can't set pause parameters\n");
     }
-  } else if (option==RING_PAR ) {  
-    if (snprintf(system_cmd,sizeof(system_cmd),"ethtool -G %s rx 4096 tx 4096",DEFAULT_IF) > 0) {
-      system(system_cmd);
+    break;
+    
+  case RING_PAR:
+    ret=snprintf(system_cmd,sizeof(system_cmd),"ethtool -G %s rx %d tx %d",eth->if_name[Mod_id],value);
+    if (ret > 0) {
+      ret=system(system_cmd);
+      if (ret == -1) {
+	fprintf (stderr,"[ETHERNET] Can't start shell to execute %s %s",system_cmd, strerror(errno));
+      } else {
+	printf ("[ETHERNET] status of %s is %i\n",WEXITSTATUS(ret));
+      }            
       printf("[ETHERNET] Ring parameters %s\n",system_cmd);
     } else {
       perror("[ETHERNET] Can't set ring parameters\n");
     }
+    break;
     
+  default:
+    break;
   }
+  
   return 0;
 }
 
 
 
-int openair0_dev_init_eth(openair0_device *device, openair0_config_t *openair0_cfg) {
+int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params ) {
 
   eth_state_t *eth = (eth_state_t*)malloc(sizeof(eth_state_t));
-  int card = 0;
   memset(eth, 0, sizeof(eth_state_t));
-  eth->buffer_size =  (unsigned int)openair0_cfg[card].samples_per_packet*sizeof(int32_t); // buffer size = 4096 for sample_len of 1024
-  eth->sample_rate = (unsigned int)openair0_cfg[card].sample_rate;
-  device->priv = eth; 	
 
-  printf("ETHERNET: Initializing openair0_device for %s ...\n", ((device->func_type == BBU_FUNC) ? "BBU": "RRH"));
+  if (eth_params->transp_preference == 1) {
+    eth->flags = ETH_RAW_MODE;
+  } else {
+    eth->flags = ETH_UDP_MODE;
+  }
+  
+  printf("[ETHERNET]: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"));
   device->Mod_id           = num_devices_eth++;
+  device->transp_type      = ETHERNET_TP;
   device->trx_start_func   = trx_eth_start;
   device->trx_request_func = trx_eth_request;
   device->trx_reply_func   = trx_eth_reply;
-  device->trx_write_func   = trx_eth_write;
-  device->trx_read_func    = trx_eth_read;  
   device->trx_get_stats_func   = trx_eth_get_stats;
   device->trx_reset_stats_func = trx_eth_reset_stats;
-  device->trx_end_func = trx_eth_end;
-  device->trx_stop_func = trx_eth_stop;
+  device->trx_end_func         = trx_eth_end;
+  device->trx_stop_func        = trx_eth_stop;
   device->trx_set_freq_func = trx_eth_set_freq;
   device->trx_set_gains_func = trx_eth_set_gains;
-  
-  memcpy((void*)&device->openair0_cfg,(void*)openair0_cfg,sizeof(openair0_config_t));
+
+  if ((eth->flags & ETH_RAW_MODE) != 0 ) {
+    device->trx_write_func   = trx_eth_write_raw;
+    device->trx_read_func    = trx_eth_read_raw;     
+  } else {
+    device->trx_write_func   = trx_eth_write_udp;
+    device->trx_read_func    = trx_eth_read_udp;     
+  }
+
+  eth->if_name[device->Mod_id] = eth_params->local_if_name;
+  device->priv = eth;
+ 	
+  /* device specific */
+  openair0_cfg[0].txlaunch_wait = 0;//manage when TX processing is triggered
+  openair0_cfg[0].txlaunch_wait_slotcount = 0; //manage when TX processing is triggered
+  openair0_cfg[0].iq_rxrescale = 15;//rescale iqs
+  openair0_cfg[0].iq_txshift = eth_params->iq_txshift;// shift
+  openair0_cfg[0].tx_sample_advance = eth_params->tx_sample_advance;
+
+  /* RRH does not have any information to make this configuration atm */
+  if (device->host_type == BBU_HOST) {
+    /*Note scheduling advance values valid only for case 7680000 */    
+    switch ((int)openair0_cfg[0].sample_rate) {
+    case 30720000:
+      openair0_cfg[0].samples_per_packet    = 4096;     
+      break;
+    case 23040000:     
+      openair0_cfg[0].samples_per_packet    = 2048;
+      break;
+    case 15360000:
+      openair0_cfg[0].samples_per_packet    = 2048;      
+      break;
+    case 7680000:
+      openair0_cfg[0].samples_per_packet    = 1024;     
+      break;
+    case 1920000:
+      openair0_cfg[0].samples_per_packet    = 256;     
+      break;
+    default:
+      printf("Error: unknown sampling rate %f\n",openair0_cfg[0].sample_rate);
+      exit(-1);
+      break;
+    }
+    openair0_cfg[0].tx_scheduling_advance = eth_params->tx_scheduling_advance*openair0_cfg[0].samples_per_packet;
+  }
+ 
+  device->openair0_cfg=&openair0_cfg[0];
   return 0;
 }
+
+
+/**************************************************************************************************************************
+ *                                         DEBUGING-RELATED FUNCTIONS                                                     *
+ **************************************************************************************************************************/
+void dump_packet(char *title, unsigned char* pkt, int bytes, unsigned int tx_rx_flag) {
+   
+  static int numSend = 1;
+  static int numRecv = 1;
+  int num, k;
+  char tmp[48];
+  unsigned short int cksum;
+  
+  num = (tx_rx_flag)? numSend++:numRecv++;
+  for (k = 0; k < 24; k++) sprintf(tmp+k, "%02X", pkt[k]);
+  cksum = calc_csum((unsigned short *)pkt, bytes>>2);
+  printf("%s-%s (%06d): %s 0x%04X\n", title,(tx_rx_flag)? "TX":"RX", num, tmp, cksum);
+}
+
+unsigned short calc_csum (unsigned short *buf, int nwords) {
+ 
+ unsigned long sum;
+  for (sum = 0; nwords > 0; nwords--)
+    sum += *buf++;
+  sum = (sum >> 16) + (sum & 0xffff);
+  sum += (sum >> 16);
+  return ~sum;
+}
+
+void dump_dev(openair0_device *device) {
+
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  
+  printf("Ethernet device interface %i configuration:\n" ,device->openair0_cfg->Mod_id);
+  printf("       Log level is %i :\n" ,device->openair0_cfg->log_level);	
+  printf("       RB number: %i, sample rate: %lf \n" ,
+        device->openair0_cfg->num_rb_dl, device->openair0_cfg->sample_rate);
+  printf("       Scheduling_advance: %i, Sample_advance: %u \n" ,
+        device->openair0_cfg->tx_scheduling_advance, device->openair0_cfg->tx_sample_advance);		
+  printf("       BBU configured for %i tx/%i rx channels)\n",
+	device->openair0_cfg->tx_num_channels,device->openair0_cfg->rx_num_channels);
+   printf("       Running flags: %s %s %s\n",      
+	((eth->flags & ETH_RAW_MODE)  ? "RAW socket mode - ":""),
+	((eth->flags & ETH_UDP_MODE)  ? "UDP socket mode - ":""));	  	
+  printf("       Number of iqs dumped when displaying packets: %i\n\n",eth->iqdumpcnt);   
+  
+}
+
+void inline dump_txcounters(openair0_device *device) {
+  eth_state_t *eth = (eth_state_t*)device->priv;  
+  printf("   Ethernet device interface %i, tx counters:\n" ,device->openair0_cfg->Mod_id);
+  printf("   Sent packets: %llu send errors: %i\n",   eth->tx_count, eth->num_tx_errors);	 
+}
+
+void inline dump_rxcounters(openair0_device *device) {
+
+  eth_state_t *eth = (eth_state_t*)device->priv;
+  printf("   Ethernet device interface %i rx counters:\n" ,device->openair0_cfg->Mod_id);
+  printf("   Received packets: %llu missed packets errors: %i\n", eth->rx_count, eth->num_underflows);	 
+}  
+
+void inline dump_buff(openair0_device *device, char *buff,unsigned int tx_rx_flag, int nsamps) {
+  
+  char *strptr;
+  eth_state_t *eth = (eth_state_t*)device->priv;  
+  /*need to add ts number of iqs in printf need to fix dump iqs call */
+  strptr = (( tx_rx_flag == TX_FLAG) ? "TX" : "RX");
+  printf("\n %s, nsamps=%i \n" ,strptr,nsamps);     
+  
+  if (tx_rx_flag == 1) {
+    dump_txcounters(device);
+    printf("  First %i iqs of TX buffer\n",eth->iqdumpcnt);
+    dump_iqs(buff,eth->iqdumpcnt);
+  } else {
+    dump_rxcounters(device);
+    printf("  First %i iqs of RX buffer\n",eth->iqdumpcnt);
+    dump_iqs(buff,eth->iqdumpcnt);      
+  }
+  
+}
+
+void dump_iqs(char * buff, int iq_cnt) {
+  int i;
+  for (i=0;i<iq_cnt;i++) {
+    printf("s%02i: Q=%+ij I=%+i%s",i,
+	   ((iqoai_t *)(buff))[i].q,
+	   ((iqoai_t *)(buff))[i].i,
+	   ((i+1)%3 == 0) ? "\n" : "  ");
+  }   
+}
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
index eabec94ebcba082f1c72929664e452919f7cd5bd..b4618bb8254d4abccaf8808ad7024e6cbb53a6b6 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
@@ -36,6 +36,8 @@
  * \note
  * \warning 
  */
+#ifndef ETHERNET_LIB_H
+#define ETHERNET_LIB_H
 
 #include <arpa/inet.h>
 #include <linux/if_packet.h>
@@ -47,71 +49,90 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#define MAX_INST        4
-#define DEFAULT_IF  "lo"
-#define BUF_SIZ      8960 /*Jumbo frame size*/
+#define MAX_INST      4
+#define DEFAULT_IF   "lo"
 
-typedef struct {
+#define ETH_RAW_MODE        1
+#define ETH_UDP_MODE        0
 
-  // opaque eth data struct
-  //struct eth_if *dev;
-  // An empty ("") or NULL device identifier will result in the first encountered device being opened (using the first discovered backend)
+#define TX_FLAG	        1
+#define RX_FLAG 	0
 
-  int sockfd[MAX_INST];
-  struct sockaddr_in dest_addr[MAX_INST];
+#define MAX_PACKET_SEQ_NUM(spp,spf) (spf/spp)
+#define MAC_HEADER_SIZE_BYTES (sizeof(struct ether_header))
+#define APP_HEADER_SIZE_BYTES (sizeof(int32_t) + sizeof(openair0_timestamp))
+#define PAYLOAD_SIZE_BYTES(nsamps) (nsamps<<2)
+#define UDP_PACKET_SIZE_BYTES(nsamps) (APP_HEADER_SIZE_BYTES + PAYLOAD_SIZE_BYTES(nsamps))
+#define RAW_PACKET_SIZE_BYTES(nsamps) (APP_HEADER_SIZE_BYTES + MAC_HEADER_SIZE_BYTES + PAYLOAD_SIZE_BYTES(nsamps))
 
-  unsigned int buffer_size;
-  unsigned int timeout_ns;
 
-  //struct eth_metadata meta_rx;
-  //struct eth_metadata meta_tx;
-
-  unsigned int sample_rate;
-  // time offset between transmiter timestamp and receiver timestamp;
+/*!\brief opaque ethernet data structure */
+typedef struct {
+  
+  /*!\brief socket file desc */ 
+  int sockfd[MAX_INST];
+  /*!\brief interface name */ 
+  char *if_name[MAX_INST];
+  /*!\brief buffer size */ 
+  unsigned int buffer_size;
+  /*!\brief timeout ms */ 
+  unsigned int rx_timeout_ms;
+  /*!\brief timeout ms */ 
+  unsigned int tx_timeout_ms;
+  /*!\brief runtime flags */ 
+  uint32_t flags;   
+  /*!\ time offset between transmiter timestamp and receiver timestamp */ 
   double tdiff;
-  // use brf_time_offset to get this value
-  int tx_forward_nsamps; //166 for 20Mhz
-
-
+  /*!\ calibration */
+  int tx_forward_nsamps;
+  
   // --------------------------------
   // Debug and output control
   // --------------------------------
+  
+  /*!\brief number of I/Q samples to be printed */ 
+  int iqdumpcnt;
+
+  /*!\brief number of underflows in interface */ 
   int num_underflows;
+  /*!\brief number of overflows in interface */ 
   int num_overflows;
+  /*!\brief number of concesutive errors in interface */ 
   int num_seq_errors;
+  /*!\brief number of errors in interface's receiver */ 
   int num_rx_errors;
+  /*!\brief umber of errors in interface's transmitter */ 
   int num_tx_errors;
-
-  uint64_t tx_actual_nsamps; // actual number of samples transmitted
+  
+  /*!\brief current TX timestamp */ 
+  openair0_timestamp tx_current_ts;
+  /*!\brief socket file desc */ 
+  openair0_timestamp rx_current_ts;
+  /*!\brief actual number of samples transmitted */ 
+  uint64_t tx_actual_nsamps; 
+  /*!\brief actual number of samples received */
   uint64_t rx_actual_nsamps;
-  uint64_t tx_nsamps; // number of planned samples
+  /*!\brief number of samples to be transmitted */
+  uint64_t tx_nsamps; 
+  /*!\brief number of samples to be received */
   uint64_t rx_nsamps;
-  uint64_t tx_count; // number pf packets
+  /*!\brief number of packets transmitted */
+  uint64_t tx_count; 
+  /*!\brief number of packets received */
   uint64_t rx_count;
-  //openair0_timestamp rx_timestamp;
 
 } eth_state_t;
 
-#define 	ETH_META_STATUS_OVERRUN   (1 << 0)
-#define 	ETH_META_STATUS_UNDERRUN  (1 << 1)
-
-struct eth_meta_data{
-	uint64_t 	timestamp;
-	uint32_t 	flags;	 
-	uint32_t 	status;
- 	unsigned int 	actual_count;
-};
-
 
 
 /*!\brief packet header */
 typedef struct {
+  /*!\brief packet sequence number max value=packets per frame*/
+  uint16_t seq_num ;
+  /*!\brief antenna port used to resynchronize */
+  uint16_t antenna_id;
   /*!\brief packet's timestamp */ 
   openair0_timestamp timestamp;
-  /*!\brief variable declared for alignment purposes (sample size=32 bit)  */
-  int16_t not_used;
-  /*!\brief antenna port used to resynchronize */
-  int16_t antenna_id;
 } header_t;
 
 /*!\brief different options for ethernet tuning in socket and driver level */
@@ -138,9 +159,37 @@ typedef enum {
   MAX_OPT
 } eth_opt_t;
 
+/*
+#define SND_BUF_SIZE	1
+#define RCV_BUF_SIZE	1<<1
+#define SND_TIMEOUT	1<<2
+#define RCV_TIMEOUT	1<<3
+#define MTU_SIZE        1<<4
+#define TX_Q_LEN	1<<5
+#define RING_PAR	1<<5
+#define COALESCE_PAR	1<<6
+#define PAUSE_PAR       1<<7
+*/
 
+/*!\brief I/Q samples */
+typedef struct {
+  /*!\brief phase  */
+  short i;
+  /*!\brief quadrature */
+  short q;
+} iqoai_t ;
 
-/*! \fn int ethernet_tune (openair0_device *device, eth_opt_t option)
+void dump_packet(char *title, unsigned char* pkt, int bytes, unsigned int tx_rx_flag);
+unsigned short calc_csum (unsigned short *buf, int nwords);
+void dump_dev(openair0_device *device);
+void inline dump_buff(openair0_device *device, char *buff,unsigned int tx_rx_flag,int nsamps);
+void inline dump_rxcounters(openair0_device *device);
+void inline dump_txcounters(openair0_device *device);
+void dump_iqs(char * buff, int iq_cnt);
+
+
+
+/*! \fn int ethernet_tune (openair0_device *device, unsigned int option, int value);
 * \brief this function allows you to configure certain ethernet parameters in socket or device level
 * \param[in] openair0 device which bears the socket
 * \param[in] name of parameter to configure
@@ -148,6 +197,37 @@ typedef enum {
 * \note
 * @ingroup  _oai
 */
-int ethernet_tune (openair0_device *device, eth_opt_t option);
-int ethernet_write_data(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc) ;
-int ethernet_read_data(openair0_device *device,openair0_timestamp *timestamp,void **buff, int nsamps,int cc);
+int ethernet_tune(openair0_device *device, unsigned int option, int value);
+
+
+
+/*! \fn int eth_socket_init_udp(openair0_device *device)
+* \brief initialization of UDP Socket to communicate with one destination
+* \param[in] *device openair device for which the socket will be created
+* \param[out]
+* \return 0 on success, otherwise -1
+* \note
+* @ingroup  _oai
+*/
+int eth_socket_init_udp(openair0_device *device);
+int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags);
+int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc);
+int eth_get_dev_conf_udp(openair0_device *device);
+
+/*! \fn static int eth_set_dev_conf_udp(openair0_device *device)
+* \brief
+* \param[in] *device openair device
+* \param[out]
+* \return 0 on success, otherwise -1
+* \note
+* @ingroup  _oai
+*/
+int eth_set_dev_conf_udp(openair0_device *device);
+int eth_socket_init_raw(openair0_device *device);
+int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps,int cc, int flags);
+int trx_eth_read_raw(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc);
+int eth_get_dev_conf_raw(openair0_device *device);
+int eth_set_dev_conf_raw(openair0_device *device);
+
+
+#endif
diff --git a/targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c b/targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
index 238c94bd7e97a6ce6d6330f260ca99c38e83e5b5..427cd47be831bd4f266789d1d1af1ebf34176f46 100644
--- a/targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
+++ b/targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
@@ -247,7 +247,7 @@ int openair0_stop_without_reset(int card)
 #define MY_RF_MODE      (RXEN + TXEN + TXLPFNORM + TXLPFEN + TXLPF25 + RXLPFNORM + RXLPFEN + RXLPF25 + LNA1ON +LNAMax + RFBBNORM + DMAMODE_RX + DMAMODE_TX)
 #define RF_MODE_BASE    (LNA1ON + RFBBNORM)
 
-int openair0_dev_init_exmimo(openair0_device *device, openair0_config_t *openair0_cfg) {
+int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
 
   // Initialize card
   //  exmimo_config_t         *p_exmimo_config;
@@ -287,6 +287,8 @@ int openair0_dev_init_exmimo(openair0_device *device, openair0_config_t *openair
     return(-1);
   }
 
+  device->type             = EXMIMO_DEV; 
+
   return(0);
 }
 
@@ -323,6 +325,12 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag)
     else
       p_exmimo_config->framing.multicard_syncmode=SYNCMODE_SLAVE;
 
+    /* device specific */
+    openair0_cfg[card].txlaunch_wait = 1;//manage when TX processing is triggered
+    openair0_cfg[card].txlaunch_wait_slotcount = 1; //manage when TX processing is triggered
+    openair0_cfg[card].iq_txshift = 4;//shift
+    openair0_cfg[card].iq_rxrescale = 15;//rescale iqs
+
     if (openair0_cfg[card].sample_rate==30.72e6) {
       resampling_factor = 0;
       rx_filter = RXLPF10;
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/CMakeLists.txt b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..88a021ae001b40c2992653227425b50a70de9f0e
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(si5351_src_files
+	Si5351C.cpp
+)
+set(CMAKE_CXX_FLAGS
+  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 "
+)
+
+
+add_library(Si5351C STATIC ${si5351_src_files})
+target_include_directories(Si5351C PUBLIC ../lms7002m ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(Si5351C LMS7002M)
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..88bcb74f3d5c29e99495a773b757fd8355160ad4
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.cpp
@@ -0,0 +1,872 @@
+/**
+@file	Si5351C.cpp
+@author	Lime Microsystems
+@brief 	Configuring of Si5351C
+*/
+
+#include "Si5351C.h"
+#include "lmsComms.h"
+#include <math.h>
+#include <iomanip>
+#include <fstream>
+#include <sstream>
+#include <set>
+#include <string.h>
+#include <assert.h>
+#include <iostream>
+using namespace std;
+
+#define Log(msg, type) cout << (msg) << endl;
+
+/// Splits float into fraction integers A + B/C
+void realToFrac(const float real, int &A, int &B, int &C)
+{
+    A = (int)real;
+    B = (int)((real - A) * 1048576 + 0.5);
+    C = 1048576;
+
+    int a = B;
+    int b = C;
+    int temp;
+    while( b!= 0) // greatest common divider
+    {
+        temp = a % b;
+        a = b;
+        b = temp;
+    }
+    B = B/a;
+    C = C/a;
+}
+
+/// Default configuration
+const unsigned char Si5351C::m_defaultConfiguration[] =
+{ 0,0x00,
+  1,0x00,
+  2,0x08,
+  3,0x00,
+  4,0x00,
+  5,0x00,
+  6,0x00,
+  7,0x00,
+  8,0x00,
+  9,0x00,
+ 10,0x00,
+ 11,0x00,
+ 12,0x00,
+ 13,0x00,
+ 14,0x00,
+ 15,0x04,
+ 16,0x4F,
+ 17,0x4F,
+ 18,0x4F,
+ 19,0x4F,
+ 20,0x4F,
+ 21,0x4F,
+ 22,0x0F,
+ 23,0x0F,
+ 24,0x00,
+ 25,0x00,
+ 26,0x00,
+ 27,0x80,
+ 28,0x00,
+ 29,0x0B,
+ 30,0x2F,
+ 31,0x00,
+ 32,0x00,
+ 33,0x00,
+ 34,0x00,
+ 35,0x00,
+ 36,0x00,
+ 37,0x00,
+ 38,0x00,
+ 39,0x00,
+ 40,0x00,
+ 41,0x00,
+ 42,0x00,
+ 43,0x01,
+ 44,0x00,
+ 45,0x0D,
+ 46,0x00,
+ 47,0x00,
+ 48,0x00,
+ 49,0x00,
+ 50,0x00,
+ 51,0x01,
+ 52,0x00,
+ 53,0x0D,
+ 54,0x00,
+ 55,0x00,
+ 56,0x00,
+ 57,0x00,
+ 58,0x00,
+ 59,0x01,
+ 60,0x00,
+ 61,0x0D,
+ 62,0x00,
+ 63,0x00,
+ 64,0x00,
+ 65,0x00,
+ 66,0x00,
+ 67,0x01,
+ 68,0x00,
+ 69,0x0D,
+ 70,0x00,
+ 71,0x00,
+ 72,0x00,
+ 73,0x00,
+ 74,0x00,
+ 75,0x01,
+ 76,0x00,
+ 77,0x0D,
+ 78,0x00,
+ 79,0x00,
+ 80,0x00,
+ 81,0x00,
+ 82,0x00,
+ 83,0x01,
+ 84,0x00,
+ 85,0x0D,
+ 86,0x00,
+ 87,0x00,
+ 88,0x00,
+ 89,0x00,
+ 90,0x1E,
+ 91,0x1E,
+ 92,0x00,
+ 93,0x00,
+ 94,0x00,
+ 95,0x00,
+ 96,0x00,
+ 97,0x00,
+ 98,0x00,
+ 99,0x00,
+100,0x00,
+101,0x00,
+102,0x00,
+103,0x00,
+104,0x00,
+105,0x00,
+106,0x00,
+107,0x00,
+108,0x00,
+109,0x00,
+110,0x00,
+111,0x00,
+112,0x00,
+113,0x00,
+114,0x00,
+115,0x00,
+116,0x00,
+117,0x00,
+118,0x00,
+119,0x00,
+120,0x00,
+121,0x00,
+122,0x00,
+123,0x00,
+124,0x00,
+125,0x00,
+126,0x00,
+127,0x00,
+128,0x00,
+129,0x00,
+130,0x00,
+131,0x00,
+132,0x00,
+133,0x00,
+134,0x00,
+135,0x00,
+136,0x00,
+137,0x00,
+138,0x00,
+139,0x00,
+140,0x00,
+141,0x00,
+142,0x00,
+143,0x00,
+144,0x00,
+145,0x00,
+146,0x00,
+147,0x00,
+148,0x00,
+149,0x00,
+150,0x00,
+151,0x00,
+152,0x00,
+153,0x00,
+154,0x00,
+155,0x00,
+156,0x00,
+157,0x00,
+158,0x00,
+159,0x00,
+160,0x00,
+161,0x00,
+162,0x00,
+163,0x00,
+164,0x00,
+165,0x00,
+166,0x00,
+167,0x00,
+168,0x00,
+169,0x00,
+170,0x00,
+171,0x00,
+172,0x00,
+173,0x00,
+174,0x00,
+175,0x00,
+176,0x00,
+177,0x00,
+178,0x00,
+179,0x00,
+180,0x00,
+181,0x30,
+182,0x00,
+183,0xD2,
+184,0x60,
+185,0x60,
+186,0x00,
+187,0xC0,
+188,0x00,
+189,0x00,
+190,0x00,
+191,0x00,
+192,0x00,
+193,0x00,
+194,0x00,
+195,0x00,
+196,0x00,
+197,0x00,
+198,0x00,
+199,0x00,
+200,0x00,
+201,0x00,
+202,0x00,
+203,0x00,
+204,0x00,
+205,0x00,
+206,0x00,
+207,0x00,
+208,0x00,
+209,0x00,
+210,0x00,
+211,0x00,
+212,0x00,
+213,0x00,
+214,0x00,
+215,0x00,
+216,0x00,
+217,0x00,
+218,0x00,
+219,0x00,
+220,0x00,
+221,0x0D,
+222,0x00,
+223,0x00,
+224,0x00,
+225,0x00,
+226,0x00,
+227,0x00,
+228,0x00,
+229,0x00,
+230,0x00,
+231,0x00,
+232,0x00};
+
+// ---------------------------------------------------------------------------
+Si5351C::Si5351C()
+{
+    memset(m_newConfiguration, 0, 255);
+    for(unsigned int i=0; i<sizeof(m_defaultConfiguration); i+=2)
+    {
+        m_newConfiguration[m_defaultConfiguration[i]] = m_defaultConfiguration[i+1];
+    }
+	device = NULL;
+}
+// ---------------------------------------------------------------------------
+
+Si5351C::~Si5351C()
+{
+
+}
+
+/** @brief Sends Configuration to Si5351C
+*/
+Si5351C::Status Si5351C::UploadConfiguration()
+{
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_SI5351_WR;
+    
+	if (!device)
+        return FAILED;
+    //Disable outputs
+	pkt.outBuffer.push_back(3);
+    pkt.outBuffer.push_back(0xFF);
+	//Power down all output drivers
+	for(int i=0; i<8; ++i)
+    {
+        pkt.outBuffer.push_back(16 + i);
+        pkt.outBuffer.push_back(0x84);
+    }
+	//write new configuration
+	for (int i = 15; i <= 92; ++i)
+	{
+        pkt.outBuffer.push_back(i);
+        pkt.outBuffer.push_back(m_newConfiguration[i]);
+	}
+	for (int i = 149; i <= 170; ++i)
+	{
+        pkt.outBuffer.push_back(i);
+        pkt.outBuffer.push_back(m_newConfiguration[i]);
+	}
+	//apply soft reset
+    pkt.outBuffer.push_back(177);
+    pkt.outBuffer.push_back(0xAC);
+    //Enabe desired outputs
+    pkt.outBuffer.push_back(3);
+    pkt.outBuffer.push_back(m_newConfiguration[3]);
+
+	if( !device->IsOpen() )
+	{   
+        return FAILED;
+	}        
+    LMScomms::TransferStatus status;
+    status = device->TransferPacket(pkt);
+    if (status != LMScomms::TRANSFER_SUCCESS || pkt.status != STATUS_COMPLETED_CMD)
+    {
+        return FAILED;
+    }
+    return SUCCESS;
+}
+
+// ---------------------------------------------------------------------------
+/**
+    @brief Sets connection manager to use for data transferring Si5351C
+    @param mng connection manager for data transferring
+*/
+void Si5351C::Initialize(LMScomms *mng)
+{
+    assert(mng != nullptr);
+	device = mng;	
+}
+
+/**
+    @brief Loads register values for Si5356A from file
+    @param FName input filename
+*/
+bool Si5351C::LoadRegValuesFromFile(string FName)
+{
+    fstream fin;
+    fin.open(FName.c_str(), ios::in);
+
+    const int len = 1024;
+    char line[len];
+
+    int addr;
+    int value;
+
+    while(!fin.eof())
+    {
+        fin.getline(line, len);
+        if( line[0] == '#')
+            continue;
+        if( strcmp(line, "#END_PROFILE") == 0)
+            break;
+        sscanf(line, "%i,%x",&addr,&value);
+        m_newConfiguration[addr] = value;
+    }
+
+    fin.close();
+	return false;
+};
+
+/** @brief Calculates multisynth dividers and VCO frequencies
+    @param clocks output clocks configuration
+    @param plls plls configurations
+    @param Fmin lowest VCO frequency
+    @param Fmax highest VCO frequency
+*/
+void Si5351C::FindVCO(Si5351_Channel *clocks, Si5351_PLL *plls, const unsigned long Fmin, const unsigned long Fmax)
+{
+    int clockCount = 8;
+    //reset output parameters
+    for(int i=0; i<clockCount; i++)
+    {
+        clocks[i].pllSource = 0;
+        clocks[i].int_mode = 0;
+        clocks[i].multisynthDivider = 8;
+    }
+
+    bool clk6satisfied = !clocks[6].powered;
+    bool clk7satisfied = !clocks[7].powered;
+
+    bool pllAused = false;
+    bool pllBused = false;
+
+    map< unsigned long, int> availableFrequenciesPLLA; //all available frequencies for VCO
+    map< unsigned long, int> availableFrequenciesPLLB; //all available frequencies for VCO
+
+    //if clk6 or clk7 is used make available frequencies according to them
+    if(clocks[6].powered || clocks[7].powered)
+    {
+        set<unsigned long> clk6freqs;
+        set<unsigned long> clk7freqs;
+        set<unsigned long> sharedFreqs;
+        unsigned int mult = 6;
+        if(!clk6satisfied)
+        {
+            unsigned long freq = clocks[6].outputFreqHz;
+            while(freq <= Fmax && mult <= 254)
+            {
+                freq = clocks[6].outputFreqHz*mult;
+                if(freq >= Fmin && freq <= Fmax)
+                {
+                    clk6freqs.insert(freq);
+                }
+                mult += 2;
+            }
+        }
+        mult = 6;
+        if(!clk7satisfied)
+        {
+            unsigned long freq = clocks[7].outputFreqHz;
+            while(freq <= Fmax && mult <= 254)
+            {
+                freq = clocks[7].outputFreqHz*mult;
+                if(freq >= Fmin && freq <= Fmax)
+                {
+                    clk7freqs.insert(freq);
+                }
+                mult += 2;
+            }
+        }
+        bool canShare = false;
+        //find if clk6 and clk7 can share the same pll
+        for (set<unsigned long>::iterator it6=clk6freqs.begin(); it6!=clk6freqs.end(); ++it6)
+        {
+            for (set<unsigned long>::iterator it7=clk7freqs.begin(); it7!=clk7freqs.end(); ++it7)
+            {
+                if(*it6 == *it7)
+                {
+                    canShare = true;
+                    sharedFreqs.insert(*it6);
+                }
+            }
+        }
+        if(canShare) //assign PLLA for both clocks
+        {
+            clocks[6].pllSource = 0;
+            clocks[7].pllSource = 0;
+            pllAused = true;
+            for (set<unsigned long>::iterator it=sharedFreqs.begin(); it!=sharedFreqs.end(); ++it)
+            {
+                availableFrequenciesPLLA.insert( pair<unsigned long, int> (*it, 0) );
+            }
+            clk6satisfied = true;
+            clk7satisfied = true;
+        }
+        else //if clocks 6 and 7 can't share pll, assign pllA to clk6 and pllB to clk7
+        {
+            if(!clk6satisfied)
+            {
+                clocks[6].pllSource = 0;
+                clk6satisfied = true;
+                pllAused = true;
+                for (set<unsigned long>::iterator it6=clk6freqs.begin(); it6!=clk6freqs.end(); ++it6)
+                {
+                    availableFrequenciesPLLA.insert( pair<unsigned long, int>(*it6, 0) );
+                }
+            }
+            if(!clk7satisfied)
+            {
+                clocks[7].pllSource = 1;
+                clk7satisfied = true;
+                pllBused = true;
+                for (set<unsigned long>::iterator it7=clk7freqs.begin(); it7!=clk7freqs.end(); ++it7)
+                {
+                    availableFrequenciesPLLB.insert( pair<unsigned long, int> (*it7, 0) );
+                }
+            }
+        }
+    }
+
+    //PLLA stage, find  all clocks that have integer coefficients with PLLA
+    //if pllA is not used by clk6 or clk7, fill available frequencies according to clk1-clk5 clocks
+    if( availableFrequenciesPLLA.size() == 0 && !pllAused)
+    {
+        for(int i=0; i<6; ++i)
+        {
+            unsigned long freq = clocks[i].outputFreqHz > Fmin ? clocks[i].outputFreqHz : (clocks[i].outputFreqHz*((Fmin/clocks[i].outputFreqHz) + ((Fmin%clocks[i].outputFreqHz)!=0)));
+            while(freq >= Fmin && freq <= Fmax)
+            {
+                //add all output frequency multiples that are in VCO interval
+                availableFrequenciesPLLA.insert( pair<unsigned long, int> (freq, 0));
+                freq += clocks[i].outputFreqHz;
+            }
+        }
+    }
+
+    unsigned int bestScore = 0; //score shows how many outputs have integer dividers
+    //calculate scores for all available frequencies
+    unsigned long bestVCOA = 0;
+    for (map<unsigned long, int>::iterator it=availableFrequenciesPLLA.begin(); it!=availableFrequenciesPLLA.end(); ++it)
+    {
+        for(int i=0; i<8; ++i)
+        {
+            if(clocks[i].outputFreqHz == 0 || !clocks[i].powered)
+                continue;
+
+            if( (it->first % clocks[i].outputFreqHz) == 0)
+            {
+                it->second = it->second+1;
+            }
+        }
+        if(it->second >= bestScore)
+        {
+            bestScore = it->second;
+            bestVCOA = it->first;
+        }
+    }
+    //scores calculated
+    //cout << "PLLA stage: " << endl;
+    //cout << "best score: " << bestScore << "     best VCO: " << bestVCOA << endl;
+    plls[0].VCO_Hz = bestVCOA;
+    plls[0].feedbackDivider = (double)bestVCOA/plls[0].inputFreqHz;
+
+    for(int i=0; i<clockCount; ++i)
+    {
+        if(clocks[i].outputFreqHz == 0 || !clocks[i].powered)
+            continue;
+
+        clocks[i].multisynthDivider = bestVCOA/clocks[i].outputFreqHz;
+        if(bestVCOA%clocks[i].outputFreqHz == 0)
+        {
+            clocks[i].int_mode = true;
+            clocks[i].multisynthDivider = bestVCOA/clocks[i].outputFreqHz;
+        }
+        else
+        {
+            clocks[i].int_mode = false;
+            clocks[i].multisynthDivider = (double)bestVCOA/clocks[i].outputFreqHz;
+        }
+        clocks[i].pllSource = 0;
+    }
+
+
+    //PLLB stage, find  all clocks that have integer coefficients with PLLB
+    //if pllB is not used by clk6 or clk7, fill available frequencies according to clk1-clk5 clocks, that don't have integer dividers
+    if( availableFrequenciesPLLB.size() == 0 && !pllBused)
+    {
+        for(int i=0; i<6; ++i)
+        {
+            if(clocks[i].outputFreqHz == 0 || !clocks[i].powered)
+                continue;
+
+            if(clocks[i].int_mode) //skip clocks with integer dividers
+                continue;
+            unsigned long freq = clocks[i].outputFreqHz > Fmin ? clocks[i].outputFreqHz : (clocks[i].outputFreqHz*((Fmin/clocks[i].outputFreqHz) + ((Fmin%clocks[i].outputFreqHz)!=0)));
+            while(freq >= Fmin && freq <= Fmax)
+            {
+                availableFrequenciesPLLB.insert( pair<unsigned long, int> (freq, 0));
+                freq += clocks[i].outputFreqHz;
+            }
+        }
+    }
+
+    bestScore = 0;
+    //calculate scores for all available frequencies
+    unsigned long bestVCOB = 0;
+    for (map<unsigned long, int>::iterator it=availableFrequenciesPLLB.begin(); it!=availableFrequenciesPLLB.end(); ++it)
+    {
+        for(int i=0; i<8; ++i)
+        {
+            if(clocks[i].outputFreqHz == 0 || !clocks[i].powered)
+                continue;
+
+            if( (it->first % clocks[i].outputFreqHz) == 0)
+            {
+                it->second = it->second+1;
+            }
+        }
+        if(it->second >= bestScore)
+        {
+            bestScore = it->second;
+            bestVCOB = it->first;
+        }
+    }
+    //scores calculated
+//    cout << "PLLB stage: " << endl;
+//    cout << "best score: " << bestScore << "     best VCO: " << bestVCOB << endl;
+    if(bestVCOB == 0) //just in case if pllb is not used make it the same frequency as plla
+        bestVCOB = bestVCOA;
+    plls[1].VCO_Hz = bestVCOB;
+    plls[1].feedbackDivider = (double)bestVCOB/plls[0].inputFreqHz;
+    for(int i=0; i<clockCount; ++i)
+    {
+        if(clocks[i].outputFreqHz == 0 || !clocks[i].powered)
+                continue;
+
+        if(clocks[i].int_mode)
+            continue;
+        clocks[i].multisynthDivider = bestVCOB/clocks[i].outputFreqHz;
+        if(bestVCOB%clocks[i].outputFreqHz == 0)
+        {
+            clocks[i].int_mode = true;
+            clocks[i].multisynthDivider = bestVCOB/clocks[i].outputFreqHz;
+        }
+        else
+        {
+            clocks[i].int_mode = false;
+            clocks[i].multisynthDivider = (double)bestVCOB/clocks[i].outputFreqHz;
+        }
+        clocks[i].pllSource = 1;
+    }
+}
+
+
+/** @brief Modifies register map with clock settings
+    @return true if success
+*/
+Si5351C::Status Si5351C::ConfigureClocks()
+{
+    FindVCO(CLK, PLL, 600000000, 900000000);
+    stringstream ss;
+    int addr;
+    m_newConfiguration[3] = 0;    
+    for(int i=0; i<8; ++i)
+    {
+        m_newConfiguration[3] |= (!CLK[i].powered) << i; //enabled
+        m_newConfiguration[16+i] = 0;
+        m_newConfiguration[16+i] |= !CLK[i].powered << 7; // powered
+
+        if(CLK[i].int_mode)
+        {
+            m_newConfiguration[16+i] |= 1 << 6; //integer mode
+        }
+        else
+            m_newConfiguration[16+i] |= 0 << 6;
+
+        m_newConfiguration[16+i] |= CLK[i].pllSource << 5; //PLL source
+        m_newConfiguration[16+i] |= CLK[i].inverted << 4; // invert
+        m_newConfiguration[16+i] |= 3 << 2;
+        m_newConfiguration[16+i] |= 3;
+
+        addr = 42+i*8;
+        ss.clear();
+        ss.str( string() );
+        ss << "CLK" << i << " fOut = " << CLK[i].outputFreqHz/1000000.0 << " MHz";
+        int DivA;
+        int DivB;
+        int DivC;
+
+        realToFrac(CLK[i].multisynthDivider, DivA, DivB, DivC);
+        ss << "  Multisynth Divider " << DivA << " " << DivB << "/" << DivC;
+        ss << "  R divider = " << CLK[i].outputDivider << " source = " << (CLK[i].pllSource == 0 ? "PLLA" : "PLLB") << endl;
+
+        Log(ss.str(), LOG_INFO);
+
+        if( CLK[i].multisynthDivider < 8 || 900 < CLK[i].multisynthDivider)
+        {
+            Log("Si5351C - Output multisynth divider is outside [8;900] interval.\n", LOG_ERROR);
+            return FAILED;
+        }
+
+        if(i<6)
+        {
+            if(CLK[i].outputFreqHz <= 150000000)
+            {
+                unsigned MSX_P1 = 128 * DivA + floor(128 * ( (float)DivB/DivC)) - 512;
+                unsigned MSX_P2 = 128 * DivB - DivC * floor( 128 * DivB/DivC );
+                unsigned MSX_P3 = DivC;
+
+                m_newConfiguration[addr] = MSX_P3 >> 8;
+                m_newConfiguration[addr+1] = MSX_P3;
+
+                m_newConfiguration[addr+2] = 0;
+                m_newConfiguration[addr+2] |= (MSX_P1 >> 16 ) & 0x03;
+                m_newConfiguration[addr+3] = MSX_P1 >> 8;
+                m_newConfiguration[addr+4] = MSX_P1;
+
+                m_newConfiguration[addr+5] = 0;
+                m_newConfiguration[addr+5] = (MSX_P2 >> 16) & 0x0F;
+                m_newConfiguration[addr+5] |= (MSX_P3 >> 16) << 4;
+
+                m_newConfiguration[addr+6] = MSX_P2;
+                m_newConfiguration[addr+7] = MSX_P2 >> 8;
+            }
+            else if( CLK[i].outputFreqHz <= 160000000) // AVAILABLE ONLY ON 0-5 MULTISYNTHS
+            {
+                Log("Si5351C - clock configuring for more than 150 MHz not implemented\n", LOG_ERROR); 
+                return FAILED;
+            }
+        }
+        else // CLK6 and CLK7 only integer mode
+        {
+            if(CLK[i].outputFreqHz <= 150000000)
+            {
+                if(i==6)
+                {
+                    m_newConfiguration[90] = DivA;
+                    if(DivA%2 != 0)
+                    {
+                        Log("Si5351C - CLK6 multisynth divider is not even integer\n", LOG_ERROR);
+                        return FAILED;
+                    }
+                }
+                else
+                {
+                    m_newConfiguration[91] = DivA;
+                    if(DivA%2 != 0)
+                    {
+                        Log("Si5351C - CLK7 multisynth divider is not even integer\n", LOG_ERROR);
+                        return FAILED;
+                    }
+                }
+            }
+            else if( CLK[i].outputFreqHz <= 160000000) // AVAILABLE ONLY ON 0-5 MULTISYNTHS
+            {
+                Log("Si5351C - clock configuring for more than 150 MHz not implemented\n", LOG_ERROR);
+                return FAILED;
+            }
+        }
+    }
+
+    //configure pll
+    //set input clk source
+    m_newConfiguration[15] = m_newConfiguration[15] & 0xF3;
+    m_newConfiguration[15] |= (PLL[0].CLK_SRC & 1) << 2;
+    m_newConfiguration[15] |= (PLL[1].CLK_SRC & 1) << 3;
+    for(int i=0; i<2; ++i)
+    {
+        addr = 26+i*8;
+        if(PLL[i].feedbackDivider < 15 || PLL[i].feedbackDivider > 90)
+        {
+            Log("Si5351C - VCO frequency divider out of range [15:90].\n", LOG_ERROR);
+            return FAILED;
+        }
+        if( PLL[i].VCO_Hz < 600000000 || PLL[i].VCO_Hz > 900000000)
+        {
+            Log("Si5351C - Can't calculate valid VCO frequency.\n", LOG_ERROR);
+            return FAILED;
+        }
+        ss.clear();
+        ss.str(string());
+        ss << "Si5351C : VCO" << (i==0 ? "A" : "B") << " = " << PLL[i].VCO_Hz/1000000.0 << " MHz";
+
+        //calculate MSNx_P1, MSNx_P2, MSNx_P3
+        int MSNx_P1;
+        int MSNx_P2;
+        int MSNx_P3;
+
+        int DivA;
+        int DivB;
+        int DivC;
+        realToFrac(PLL[i].feedbackDivider, DivA, DivB, DivC);
+        ss << "  Feedback Divider " << DivA << " " << DivB << "/" << DivC << endl;
+        Log(ss.str(), LOG_INFO);
+
+        MSNx_P1 = 128 * DivA + floor(128 * ( (float)DivB/DivC)) - 512;
+        MSNx_P2 = 128 * DivB - DivC * floor( 128 * DivB/DivC );
+        MSNx_P3 = DivC;
+
+        m_newConfiguration[addr+4] = MSNx_P1;
+        m_newConfiguration[addr+3] = MSNx_P1 >> 8;
+        m_newConfiguration[addr+2] = MSNx_P1 >> 16;
+
+        m_newConfiguration[addr+7] = MSNx_P2;
+        m_newConfiguration[addr+6] = MSNx_P2 >> 8;
+        m_newConfiguration[addr+5] = 0;
+        m_newConfiguration[addr+5] = (MSNx_P2 >> 16) & 0x0F;
+
+        m_newConfiguration[addr+5] |= (MSNx_P3 >> 16) << 4;
+        m_newConfiguration[addr+1] |= MSNx_P3;
+        m_newConfiguration[addr] |= MSNx_P3 >> 8;
+    }
+    return SUCCESS;
+}
+
+/** @brief Sets output clock parameters
+    @param id clock id 0-CLK0 1-CLK1 ...
+    @param fOut_Hz output frequency in Hz
+    @param enabled is this output powered
+    @param inverted invert clock
+*/
+void Si5351C::SetClock(unsigned char id, unsigned long fOut_Hz, bool enabled, bool inverted)
+{
+    if( id < 8)
+    {
+        if(fOut_Hz < 8000 || fOut_Hz > 160000000)
+        {
+            stringstream ss;
+            ss << "Si5351C - CLK" << (int)id << " output frequency must be between 8kHz and 160MHz. fOut_MHz = " << fOut_Hz/1000000.0 << endl;
+            Log(ss.str(), LOG_ERROR);
+            return;
+        }
+        CLK[id].powered = enabled;
+        CLK[id].inverted = inverted;
+        CLK[id].outputFreqHz = fOut_Hz;
+    }
+}
+
+/** @brief Sets PLL input frequency
+    @param id PLL id 0-PLLA 1-PLLB
+    @param CLKIN_Hz clock input in Hz
+*/
+void Si5351C::SetPLL(unsigned char id, unsigned long CLKIN_Hz, int CLK_SRC)
+{
+    if (id < 2)
+    {
+        PLL[id].inputFreqHz = CLKIN_Hz;
+        PLL[id].CLK_SRC = CLK_SRC;
+    }
+}
+
+/** @brief Resets configuration registers to default values
+*/
+void Si5351C::Reset()
+{
+    memset(m_newConfiguration, 0, 255);
+    for(unsigned int i=0; i<sizeof(m_defaultConfiguration); i+=2)
+    {
+        m_newConfiguration[m_defaultConfiguration[i]] = m_defaultConfiguration[i+1];
+    }
+}
+
+Si5351C::StatusBits Si5351C::GetStatusBits()
+{
+    StatusBits stat;
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_SI5351_RD;
+    pkt.outBuffer.push_back(0);
+    pkt.outBuffer.push_back(1);        
+    LMScomms::TransferStatus status;
+    status = device->TransferPacket(pkt);
+    if (status != LMScomms::TRANSFER_SUCCESS || pkt.status != STATUS_COMPLETED_CMD)
+    {
+        return stat;
+    }
+
+    stat.sys_init = (pkt.inBuffer[0] >> 7);
+    stat.lol_b = (pkt.inBuffer[0] >> 6) & 0x1;
+    stat.lol_a = (pkt.inBuffer[0] >> 5) & 0x1;
+    stat.los = (pkt.inBuffer[0] >> 4) & 0x1;
+    stat.sys_init_stky = (pkt.inBuffer[1] >> 7);
+    stat.lol_b_stky = (pkt.inBuffer[1] >> 6) & 0x1;
+    stat.lol_a_stky = (pkt.inBuffer[1] >> 5) & 0x1;
+    stat.los_stky = (pkt.inBuffer[1] >> 4) & 0x1;
+    return stat;
+}
+
+Si5351C::Status Si5351C::ClearStatus()
+{    
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_SI5351_WR;
+    pkt.outBuffer.push_back(1);
+    pkt.outBuffer.push_back(0x0);    
+    LMScomms::TransferStatus status;
+    status = device->TransferPacket(pkt);
+    if (status != LMScomms::TRANSFER_SUCCESS || pkt.status != STATUS_COMPLETED_CMD)    
+        return FAILED;
+    return SUCCESS;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.h
new file mode 100644
index 0000000000000000000000000000000000000000..971a2d1d69a81a86a2eb67c01fb81aa9d93af2e1
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/Si5351C/Si5351C.h
@@ -0,0 +1,100 @@
+/**
+@file	Si5351C.h
+@brief	Header for Si5351C.cpp
+@author	Lime Microsystems
+*/
+
+#ifndef SI5351C_MODULE
+#define SI5351C_MODULE
+
+#include <stdio.h>
+#include <string>
+using namespace std;
+//---------------------------------------------------------------------------
+
+enum eSi_CLOCK_INPUT
+{
+    Si_CLKIN,
+    Si_XTAL,
+    Si_CMOS
+};
+
+struct Si5351_Channel
+{
+    Si5351_Channel() : outputDivider(1), outputFreqHz(1), multisynthDivider(1), pllSource(0),
+        phaseOffset(0), powered(true), inverted(false), int_mode(false) {};
+    int outputDivider;
+    unsigned long outputFreqHz;
+    float multisynthDivider;
+    int pllSource;
+    float phaseOffset;
+    bool powered;
+    bool inverted;
+    bool int_mode;
+};
+
+struct Si5351_PLL
+{
+    Si5351_PLL() : inputFreqHz(0), VCO_Hz(0), feedbackDivider(0), CLKIN_DIV(1), CLK_SRC(1) {}
+    unsigned long inputFreqHz;
+    float VCO_Hz;
+    float feedbackDivider;
+    int CLKIN_DIV;
+    int CLK_SRC; //0-XTAL, 1-CLKIN
+};
+
+class LMScomms;
+class Si5351C
+{
+public:
+    enum Status
+    {
+        SUCCESS,
+        FAILED,
+    };
+
+    struct StatusBits
+    {
+        StatusBits() : sys_init(0), sys_init_stky(0), lol_b(0), lol_b_stky(0), lol_a(0), lol_a_stky(0), los(0), los_stky(0)
+        {
+
+        }
+        int sys_init;
+        int sys_init_stky;
+        int lol_b;
+        int lol_b_stky;
+        int lol_a;
+        int lol_a_stky;
+        int los;
+        int los_stky;
+    };
+
+    StatusBits GetStatusBits();
+    Status ClearStatus();
+
+	Si5351C();
+	~Si5351C();
+	void Initialize(LMScomms *mng);
+	bool LoadRegValuesFromFile(string FName);
+
+    void SetPLL(unsigned char id, unsigned long CLKIN_Hz, int CLK_SRC);
+    void SetClock(unsigned char id, unsigned long fOut_Hz, bool enabled = true, bool inverted = false);
+
+    Status UploadConfiguration();
+    Status ConfigureClocks();
+	void Reset();
+    
+private:
+    void FindVCO(Si5351_Channel *clocks, Si5351_PLL *plls, const unsigned long Fmin, const unsigned long Fmax);
+    LMScomms *device;
+
+    Si5351_PLL PLL[2];
+    Si5351_Channel CLK[8];
+
+	static const unsigned char m_defaultConfiguration[];
+	unsigned char m_newConfiguration[255];
+
+
+};
+
+#endif // SI5351C_MODULE
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/CMakeLists.txt b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cea22ac8292c7cf8ca74e571df33cd774693667c
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/CMakeLists.txt
@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE TYPE INTERNAL FORCE)
+project("lms7api")
+#include modules for finding FFTW and CyAPI
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+cmake_policy(SET CMP0015 OLD)
+if(${CMAKE_MAJOR_VERSION} GREATER 2)
+	cmake_policy(SET CMP0043 NEW)
+endif()
+ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+if(CMAKE_COMPILER_IS_GNUCXX)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+endif()
+
+# set up include-directories
+include_directories(
+  "${PROJECT_SOURCE_DIR}"
+  "${PROJECT_BINARY_DIR}"  
+  cpp-feather-ini-parser
+ )
+
+set(LMS7002M_src_files
+    LMS7002M.cpp
+	LMS7002M_parameters.cpp
+	LMS7002M_statuses.cpp
+	LMS7002M_filtersCalibration.cpp    
+	lmsComms.cpp
+	LMS7002M_RegistersMap.cpp
+)
+
+set(ENABLE_USB_CONNECTION "YES" CACHE BOOL INTERNAL)
+set(ENABLE_SPI_CONNECTION "NO" CACHE BOOL INTERNAL)
+set(CONNECTION_MANAGER_DIR connectionManager)
+set(connectionManager_src_files
+	${CONNECTION_MANAGER_DIR}/ConnectionManager.cpp
+	${CONNECTION_MANAGER_DIR}/ConnectionCOM.cpp
+	${CONNECTION_MANAGER_DIR}/ConnectionManager.h
+	${CONNECTION_MANAGER_DIR}/ConnectionCOM.h
+)
+if(ENABLE_USB_CONNECTION)
+	list(APPEND connectionManager_src_files ${CONNECTION_MANAGER_DIR}/ConnectionUSB.cpp ${CONNECTION_MANAGER_DIR}/ConnectionUSB.h)
+    add_definitions(-DENABLE_USB_CONNECTION)
+endif()
+if(ENABLE_SPI_CONNECTION)
+	list(APPEND connectionManager_src_files ${CONNECTION_MANAGER_DIR}/ConnectionSPI.cpp ${CONNECTION_MANAGER_DIR}/ConnectionSPI.h)
+    add_definitions(-DENABLE_SPI_CONNECTION)
+endif()
+
+add_library(LMS7002M STATIC ${LMS7002M_src_files} ${connectionManager_src_files})
+target_include_directories(LMS7002M PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(WIN32 AND ENABLE_USB_CONNECTION)
+	find_package(CyAPI REQUIRED)
+	LINK_DIRECTORIES(${CYAPI_LIBRARIES})	
+	include_directories(${CYAPI_INCLUDE_DIRS})
+	set(CONNECTION_MANAGER_LIBS ${CYAPI_LIBRARIES} SetupAPI)
+	target_link_libraries(LMS7002M ${CONNECTION_MANAGER_LIBS})
+endif()
+if(UNIX AND ENABLE_USB_CONNECTION)	
+	set(CONNECTION_MANAGER_LIBS usb-1.0 -lpthread)
+	target_link_libraries(LMS7002M ${CONNECTION_MANAGER_LIBS})
+endif()
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ded70e114f706d60e981f340bef0f26652a387ab
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.cpp
@@ -0,0 +1,2612 @@
+/**
+@file LMS7002M.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief Implementation of LMS7002M transceiver configuring
+*/
+
+#include "LMS7002M.h"
+#include <stdio.h>
+#include <set>
+#include "lmsComms.h"
+#include "INI.h"
+#include <cmath>
+#include <iostream>
+#include <algorithm>
+#include "LMS7002M_RegistersMap.h"
+
+#include <chrono>
+#include <thread>
+
+float_type LMS7002M::gVCO_frequency_table[3][2] = { { 3800, 5222 }, { 4961, 6754 }, {6306, 7714} };
+float_type LMS7002M::gCGEN_VCO_frequencies[2] = {2000, 2700};
+
+///define for parameter enumeration if prefix might be needed
+#define LMS7param(id) id
+
+//module addresses needs to be sorted in ascending order
+const uint16_t LMS7002M::readOnlyRegisters[] =      { 0x002F, 0x008C, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x0123, 0x0209, 0x020A, 0x020B, 0x040E, 0x040F };
+const uint16_t LMS7002M::readOnlyRegistersMasks[] = { 0x0000, 0x0FFF, 0x007F, 0x0000, 0x0000, 0x0000, 0x0000, 0x003F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
+
+/** @brief Simple logging function to print status messages
+    @param text message to print
+    @param type message type for filtering specific information
+*/
+void LMS7002M::Log(const char* text, LogType type)
+{
+    switch(type)
+    {
+    case LOG_INFO:
+        printf("%s\n", text);
+        break;
+    case LOG_WARNING:
+        printf("Warning: %s\n", text);
+        break;
+    case LOG_ERROR:
+        printf("ERROR: %s\n", text);
+        break;
+    case LOG_DATA:
+        printf("DATA: %s\n", text);
+        break;
+    }
+}
+
+LMS7002M::LMS7002M() : controlPort(NULL), mRegistersMap(new LMS7002M_RegistersMap())
+{
+    mRefClkSXR_MHz = 30.72;
+    mRefClkSXT_MHz = 30.72;
+}
+
+/** @brief Creates LMS7002M main control object, it requires LMScomms to communicate with chip
+    @param controlPort data connection for controlling LMS7002 chip registers
+*/
+LMS7002M::LMS7002M(LMScomms* controlPort) :
+    controlPort(controlPort), mRegistersMap(new LMS7002M_RegistersMap())
+{
+    mRefClkSXR_MHz = 30.72;
+    mRefClkSXT_MHz = 30.72;
+
+    //memory intervals for registers tests and calibration algorithms
+    MemorySectionAddresses[LimeLight][0] = 0x0020;
+    MemorySectionAddresses[LimeLight][1] = 0x002F;
+    MemorySectionAddresses[EN_DIR][0] = 0x0081;
+    MemorySectionAddresses[EN_DIR][1] = 0x0081;
+    MemorySectionAddresses[AFE][0] = 0x0082;
+    MemorySectionAddresses[AFE][1] = 0x0082;
+    MemorySectionAddresses[BIAS][0] = 0x0084;
+    MemorySectionAddresses[BIAS][1] = 0x0084;
+    MemorySectionAddresses[XBUF][0] = 0x0085;
+    MemorySectionAddresses[XBUF][1] = 0x0085;
+    MemorySectionAddresses[CGEN][0] = 0x0086;
+    MemorySectionAddresses[CGEN][1] = 0x008C;
+    MemorySectionAddresses[LDO][0] = 0x0092;
+    MemorySectionAddresses[LDO][1] = 0x00A7;
+    MemorySectionAddresses[BIST][0] = 0x00A8;
+    MemorySectionAddresses[BIST][1] = 0x00AC;
+    MemorySectionAddresses[CDS][0] = 0x00AD;
+    MemorySectionAddresses[CDS][1] = 0x00AE;
+    MemorySectionAddresses[TRF][0] = 0x0100;
+    MemorySectionAddresses[TRF][1] = 0x0104;
+    MemorySectionAddresses[TBB][0] = 0x0105;
+    MemorySectionAddresses[TBB][1] = 0x010A;
+    MemorySectionAddresses[RFE][0] = 0x010C;
+    MemorySectionAddresses[RFE][1] = 0x0114;
+    MemorySectionAddresses[RBB][0] = 0x0115;
+    MemorySectionAddresses[RBB][1] = 0x011A;
+    MemorySectionAddresses[SX][0] = 0x011C;
+    MemorySectionAddresses[SX][1] = 0x0124;
+    MemorySectionAddresses[TxTSP][0] = 0x0200;
+    MemorySectionAddresses[TxTSP][1] = 0x020C;
+    MemorySectionAddresses[TxNCO][0] = 0x0240;
+    MemorySectionAddresses[TxNCO][1] = 0x0261;
+    MemorySectionAddresses[TxGFIR1][0] = 0x0280;
+    MemorySectionAddresses[TxGFIR1][1] = 0x02A7;
+    MemorySectionAddresses[TxGFIR2][0] = 0x02C0;
+    MemorySectionAddresses[TxGFIR2][1] = 0x02E7;
+    MemorySectionAddresses[TxGFIR3a][0] = 0x0300;
+    MemorySectionAddresses[TxGFIR3a][1] = 0x0327;
+    MemorySectionAddresses[TxGFIR3b][0] = 0x0340;
+    MemorySectionAddresses[TxGFIR3b][1] = 0x0367;
+    MemorySectionAddresses[TxGFIR3c][0] = 0x0380;
+    MemorySectionAddresses[TxGFIR3c][1] = 0x03A7;
+    MemorySectionAddresses[RxTSP][0] = 0x0400;
+    MemorySectionAddresses[RxTSP][1] = 0x040F;
+    MemorySectionAddresses[RxNCO][0] = 0x0440;
+    MemorySectionAddresses[RxNCO][1] = 0x0461;
+    MemorySectionAddresses[RxGFIR1][0] = 0x0480;
+    MemorySectionAddresses[RxGFIR1][1] = 0x04A7;
+    MemorySectionAddresses[RxGFIR2][0] = 0x04C0;
+    MemorySectionAddresses[RxGFIR2][1] = 0x04E7;
+    MemorySectionAddresses[RxGFIR3a][0] = 0x0500;
+    MemorySectionAddresses[RxGFIR3a][1] = 0x0527;
+    MemorySectionAddresses[RxGFIR3b][0] = 0x0540;
+    MemorySectionAddresses[RxGFIR3b][1] = 0x0567;
+    MemorySectionAddresses[RxGFIR3c][0] = 0x0580;
+    MemorySectionAddresses[RxGFIR3c][1] = 0x05A7;
+
+    mRegistersMap->InitializeDefaultValues(LMS7parameterList);
+}
+
+LMS7002M::~LMS7002M()
+{
+
+}
+
+/** @brief Sends reset signal to chip, after reset enables B channel controls
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::ResetChip()
+{
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_LMS7002_RST;
+    pkt.outBuffer.push_back(LMS_RST_PULSE);
+    controlPort->TransferPacket(pkt);
+    if (pkt.status == STATUS_COMPLETED_CMD)
+    {
+        Modify_SPI_Reg_bits(LMS7param(MIMO_SISO), 0); //enable B channel after reset
+        return LIBLMS7_SUCCESS;
+    }
+    else
+        return LIBLMS7_FAILURE;
+}
+
+liblms7_status LMS7002M::LoadConfigLegacyFile(const char* filename)
+{
+    ifstream f(filename);
+    if (f.good() == false) //file not found
+    {
+        f.close();
+        return LIBLMS7_FILE_NOT_FOUND;
+    }
+    f.close();
+    uint16_t addr = 0;
+    uint16_t value = 0;
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC)); //remember used channel
+    liblms7_status status;
+    typedef INI<string, string, string> ini_t;
+    ini_t parser(filename, true);
+    if (parser.select("FILE INFO") == false)
+        return LIBLMS7_FILE_INVALID_FORMAT;
+
+    string type = "";
+    type = parser.get("type", "undefined");
+    stringstream ss;
+    if (type.find("LMS7002 configuration") == string::npos)
+    {
+        ss << "File " << filename << " not recognized" << endl;
+        return LIBLMS7_FILE_INVALID_FORMAT;
+    }
+
+    int fileVersion = 0;
+    fileVersion = parser.get("version", 0);
+
+    vector<uint16_t> addrToWrite;
+    vector<uint16_t> dataToWrite;
+    if (fileVersion == 1)
+    {
+        if (parser.select("Reference clocks"))
+        {
+            mRefClkSXR_MHz = parser.get("SXR reference frequency MHz", 30.72);
+            mRefClkSXT_MHz = parser.get("SXT reference frequency MHz", 30.72);
+        }
+
+        if (parser.select("LMS7002 registers ch.A") == true)
+        {
+            ini_t::sectionsit_t section = parser.sections.find("LMS7002 registers ch.A");
+
+            uint16_t x0020_value = 0;
+            Modify_SPI_Reg_bits(LMS7param(MAC), 1); //select A channel
+            for (ini_t::keysit_t pairs = section->second->begin(); pairs != section->second->end(); pairs++)
+            {
+                sscanf(pairs->first.c_str(), "%hx", &addr);
+                sscanf(pairs->second.c_str(), "%hx", &value);
+                if (addr == LMS7param(MAC).address) //skip register containing channel selection
+                {
+                    x0020_value = value;
+                    continue;
+                }
+                addrToWrite.push_back(addr);
+                dataToWrite.push_back(value);
+            }
+            status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+
+            //parse FCW or PHO
+            if (parser.select("NCO Rx ch.A") == true)
+            {
+                char varname[64];
+                int mode = Get_SPI_Reg_bits(LMS7param(MODE_RX));
+                if (mode == 0) //FCW
+                {                   
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "FCW%02i", i);
+                        SetNCOFrequency(LMS7002M::Rx, i, parser.get(varname, 0.0));
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "PHO%02i", i);
+                        SetNCOPhaseOffset(LMS7002M::Rx, i, parser.get(varname, 0.0));
+                    }
+                }
+            }
+            if (parser.select("NCO Tx ch.A") == true)
+            {
+                char varname[64];
+                int mode = Get_SPI_Reg_bits(LMS7param(MODE_TX));
+                if (mode == 0) //FCW
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "FCW%02i", i);
+                        SetNCOFrequency(LMS7002M::Tx, i, parser.get(varname, 0.0));
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "PHO%02i", i);
+                        SetNCOPhaseOffset(LMS7002M::Tx, i, parser.get(varname, 0.0));
+                    }
+                }
+            }
+            status = SPI_write(0x0020, x0020_value);
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+        }
+
+        Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+
+        if (parser.select("LMS7002 registers ch.B") == true)
+        {
+            addrToWrite.clear();
+            dataToWrite.clear();
+            ini_t::sectionsit_t section = parser.sections.find("LMS7002 registers ch.B");
+            for (ini_t::keysit_t pairs = section->second->begin(); pairs != section->second->end(); pairs++)
+            {
+                sscanf(pairs->first.c_str(), "%hx", &addr);
+                sscanf(pairs->second.c_str(), "%hx", &value);
+                addrToWrite.push_back(addr);
+                dataToWrite.push_back(value);
+            }
+            Modify_SPI_Reg_bits(LMS7param(MAC), 2); //select B channel
+            status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+
+            //parse FCW or PHO
+            if (parser.select("NCO Rx ch.B") == true)
+            {
+                char varname[64];
+                int mode = Get_SPI_Reg_bits(LMS7param(MODE_RX));
+                if (mode == 0) //FCW
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "FCW%02i", i);
+                        SetNCOFrequency(LMS7002M::Rx, i, parser.get(varname, 0.0));
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "PHO%02i", i);
+                        SetNCOPhaseOffset(LMS7002M::Rx, i, parser.get(varname, 0.0));
+                    }
+                }
+            }
+            if (parser.select("NCO Tx ch.A") == true)
+            {
+                char varname[64];
+                int mode = Get_SPI_Reg_bits(LMS7param(MODE_TX));
+                if (mode == 0) //FCW
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "FCW%02i", i);
+                        SetNCOFrequency(LMS7002M::Tx, i, parser.get(varname, 0.0));
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 16; ++i)
+                    {
+                        sprintf(varname, "PHO%02i", i);
+                        SetNCOPhaseOffset(LMS7002M::Tx, i, parser.get(varname, 0.0));
+                    }
+                }
+            }
+        }
+        Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+        return LIBLMS7_SUCCESS;
+    }
+    else
+        return LIBLMS7_FILE_INVALID_FORMAT;
+    return LIBLMS7_FAILURE;
+}
+
+/** @brief Reads configuration file and uploads registers to chip
+    @param filename Configuration source file
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::LoadConfig(const char* filename)
+{
+	ifstream f(filename);
+    if (f.good() == false) //file not found
+    {
+        f.close();
+        return LIBLMS7_FILE_NOT_FOUND;
+    }
+    f.close();
+    uint16_t addr = 0;
+    uint16_t value = 0;
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC)); //remember used channel
+
+    liblms7_status status;
+    typedef INI<string, string, string> ini_t;
+    ini_t parser(filename, true);
+    if (parser.select("file_info") == false)
+    {
+        //try loading as legacy format
+        status = LoadConfigLegacyFile(filename);
+        Modify_SPI_Reg_bits(MAC, 1);
+        return status;
+    }
+    string type = "";
+    type = parser.get("type", "undefined");
+    stringstream ss;
+    if (type.find("lms7002m_minimal_config") == string::npos)
+    {
+        ss << "File " << filename << " not recognized" << endl;
+        return LIBLMS7_FILE_INVALID_FORMAT;
+    }
+
+    int fileVersion = 0;
+    fileVersion = parser.get("version", 0);
+
+    vector<uint16_t> addrToWrite;
+    vector<uint16_t> dataToWrite;
+
+    if (fileVersion == 1)
+    {
+        if(parser.select("lms7002_registers_a") == true)
+        {
+            ini_t::sectionsit_t section = parser.sections.find("lms7002_registers_a");
+
+            uint16_t x0020_value = 0;
+            Modify_SPI_Reg_bits(LMS7param(MAC), 1); //select A channel
+            for (ini_t::keysit_t pairs = section->second->begin(); pairs != section->second->end(); pairs++)
+            {
+                sscanf(pairs->first.c_str(), "%hx", &addr);
+                sscanf(pairs->second.c_str(), "%hx", &value);
+                if (addr == LMS7param(MAC).address) //skip register containing channel selection
+                {
+                    x0020_value = value;
+                    continue;
+                }
+                addrToWrite.push_back(addr);
+                dataToWrite.push_back(value);
+            }
+            status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+            status = SPI_write(0x0020, x0020_value);
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+            Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+        }
+
+        if (parser.select("lms7002_registers_b") == true)
+        {
+            addrToWrite.clear();
+            dataToWrite.clear();
+            ini_t::sectionsit_t section = parser.sections.find("lms7002_registers_b");
+            for (ini_t::keysit_t pairs = section->second->begin(); pairs != section->second->end(); pairs++)
+            {
+                sscanf(pairs->first.c_str(), "%hx", &addr);
+                sscanf(pairs->second.c_str(), "%hx", &value);
+                addrToWrite.push_back(addr);
+                dataToWrite.push_back(value);
+            }
+            Modify_SPI_Reg_bits(LMS7param(MAC), 2); //select B channel
+            status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+            if (status != LIBLMS7_SUCCESS && status != LIBLMS7_NOT_CONNECTED)
+                return status;
+        }
+        Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+
+        parser.select("reference_clocks");
+        mRefClkSXR_MHz = parser.get("sxr_ref_clk_mhz", 30.72);
+        mRefClkSXT_MHz = parser.get("sxt_ref_clk_mhz", 30.72);
+    }
+
+    Modify_SPI_Reg_bits(MAC, 1);
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Reads all registers from chip and saves to file
+    @param filename destination filename
+    @return 0-success, other failure
+*/
+liblms7_status LMS7002M::SaveConfig(const char* filename)
+{
+    liblms7_status status;
+    typedef INI<> ini_t;
+    ini_t parser(filename, true);
+    parser.create("file_info");
+    parser.set("type", "lms7002m_minimal_config");
+    parser.set("version", 1);
+
+    char addr[80];
+    char value[80];
+
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+
+    vector<uint16_t> addrToRead;
+    for (uint8_t i = 0; i < MEMORY_SECTIONS_COUNT; ++i)
+        for (uint16_t addr = MemorySectionAddresses[i][0]; addr <= MemorySectionAddresses[i][1]; ++addr)
+            addrToRead.push_back(addr);
+    vector<uint16_t> dataReceived;
+    dataReceived.resize(addrToRead.size(), 0);
+
+    parser.create("lms7002_registers_a");
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+    {
+        dataReceived[i] = Get_SPI_Reg_bits(addrToRead[i], 15, 0, false);
+        sprintf(addr, "0x%04X", addrToRead[i]);
+        sprintf(value, "0x%04X", dataReceived[i]);
+        parser.set(addr, value);
+    }
+
+    parser.create("lms7002_registers_b");
+    addrToRead.clear(); //add only B channel addresses
+    for (uint8_t i = 0; i < MEMORY_SECTIONS_COUNT; ++i)
+        for (uint16_t addr = MemorySectionAddresses[i][0]; addr <= MemorySectionAddresses[i][1]; ++addr)
+            if (addr >= 0x0100)
+                addrToRead.push_back(addr);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+    {
+        dataReceived[i] = Get_SPI_Reg_bits(addrToRead[i], 15, 0, false);
+        sprintf(addr, "0x%04X", addrToRead[i]);
+        sprintf(value, "0x%04X", dataReceived[i]);
+        parser.set(addr, value);
+    }
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //retore previously used channel
+
+    parser.create("reference_clocks");
+    parser.set("sxt_ref_clk_mhz", mRefClkSXT_MHz);
+    parser.set("sxr_ref_clk_mhz", mRefClkSXR_MHz);
+    parser.save(filename);
+    return LIBLMS7_SUCCESS;
+}
+
+/**	@brief Returns reference clock in MHz used for SXT or SXR
+	@param Tx transmitter or receiver selection
+*/
+float_type LMS7002M::GetReferenceClk_SX(bool tx)
+{
+	return tx ? mRefClkSXT_MHz : mRefClkSXR_MHz;
+}
+
+/**	@return Current CLKGEN frequency in MHz
+    Returned frequency depends on reference clock used for Receiver
+*/
+float_type LMS7002M::GetFrequencyCGEN_MHz()
+{
+    float_type dMul = (mRefClkSXR_MHz/2.0)/(Get_SPI_Reg_bits(LMS7param(DIV_OUTCH_CGEN))+1); //DIV_OUTCH_CGEN
+    uint16_t gINT = Get_SPI_Reg_bits(0x0088, 13, 0); //read whole register to reduce SPI transfers
+    uint32_t gFRAC = ((gINT & 0xF) * 65536) | Get_SPI_Reg_bits(0x0087, 15, 0);
+    return dMul * (((gINT>>4) + 1 + gFRAC/1048576.0));
+}
+
+/** @brief Returns TSP reference frequency
+    @param tx TxTSP or RxTSP selection
+    @return TSP reference frequency in MHz
+*/
+float_type LMS7002M::GetReferenceClk_TSP_MHz(bool tx)
+{
+    float_type cgenFreq = GetFrequencyCGEN_MHz();
+	float_type clklfreq = cgenFreq/pow(2.0, Get_SPI_Reg_bits(LMS7param(CLKH_OV_CLKL_CGEN)));
+    if(Get_SPI_Reg_bits(LMS7param(EN_ADCCLKH_CLKGN)) == 0)
+        return tx ? clklfreq : cgenFreq/4.0;
+    else
+        return tx ? cgenFreq : clklfreq/4.0;
+}
+
+/** @brief Sets CLKGEN frequency, calculations use receiver'r reference clock
+    @param freq_MHz desired frequency in MHz
+    @return 0-succes, other-cannot deliver desired frequency
+*/
+liblms7_status LMS7002M::SetFrequencyCGEN(const float_type freq_MHz)
+{
+    float_type dFvco;
+    float_type dFrac;
+    int16_t iHdiv;
+
+    //VCO frequency selection according to F_CLKH
+    iHdiv = (int16_t)((gCGEN_VCO_frequencies[1]/ 2) / freq_MHz) - 1;
+	dFvco = 2*(iHdiv+1) * freq_MHz;
+
+    //Integer division
+    uint16_t gINT = (uint16_t)(dFvco/mRefClkSXR_MHz - 1);
+
+    //Fractional division
+    dFrac = dFvco/mRefClkSXR_MHz - (uint32_t)(dFvco/mRefClkSXR_MHz);
+    uint32_t gFRAC = (uint32_t)(dFrac * 1048576);
+
+    Modify_SPI_Reg_bits(LMS7param(INT_SDM_CGEN), gINT); //INT_SDM_CGEN
+    Modify_SPI_Reg_bits(0x0087, 15, 0, gFRAC&0xFFFF); //INT_SDM_CGEN[15:0]
+    Modify_SPI_Reg_bits(0x0088, 3, 0, gFRAC>>16); //INT_SDM_CGEN[19:16]
+    Modify_SPI_Reg_bits(LMS7param(DIV_OUTCH_CGEN), iHdiv); //DIV_OUTCH_CGEN
+
+    return TuneVCO(VCO_CGEN);
+}
+
+/** @brief Performs VCO tuning operations for CLKGEN, SXR, SXT modules
+    @param module module selection for tuning 0-cgen, 1-SXR, 2-SXT
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::TuneVCO(VCO_Module module) // 0-cgen, 1-SXR, 2-SXT
+{
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+	int8_t i;
+	uint8_t cmphl; //comparators
+	int16_t csw_lowest = -1;
+	uint16_t addrVCOpd; // VCO power down address
+	uint16_t addrCSW_VCO;
+	uint16_t addrCMP; //comparator address
+	uint8_t lsb; //SWC lsb index
+	uint8_t msb; //SWC msb index
+
+	uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC)); //remember used channel
+
+	if(module != VCO_CGEN) //set addresses to SX module
+	{
+        Modify_SPI_Reg_bits(LMS7param(MAC), module);
+        addrVCOpd = LMS7param(PD_VCO).address;
+        addrCSW_VCO = LMS7param(CSW_VCO).address;
+        lsb = LMS7param(CSW_VCO).lsb;
+        msb = LMS7param(CSW_VCO).msb;
+        addrCMP = LMS7param(VCO_CMPHO).address;
+	}
+	else //set addresses to CGEN module
+    {
+        addrVCOpd = LMS7param(PD_VCO_CGEN).address;
+        addrCSW_VCO = LMS7param(CSW_VCO_CGEN).address;
+        lsb = LMS7param(CSW_VCO_CGEN).lsb;
+        msb = LMS7param(CSW_VCO_CGEN).msb;
+        addrCMP = LMS7param(VCO_CMPHO_CGEN).address;
+    }
+	// Initialization
+	Modify_SPI_Reg_bits (addrVCOpd, 2, 1, 0); //activate VCO and comparator
+    if (Get_SPI_Reg_bits(addrVCOpd, 2, 1) != 0)
+        return LIBLMS7_VCO_IS_POWERED_DOWN;
+	if(module == VCO_CGEN)
+        Modify_SPI_Reg_bits(LMS7param(SPDUP_VCO_CGEN), 1); //SHORT_NOISEFIL=1 SPDUP_VCO_ Short the noise filter resistor to speed up the settling time
+	else
+        Modify_SPI_Reg_bits(LMS7param(SPDUP_VCO), 1); //SHORT_NOISEFIL=1 SPDUP_VCO_ Short the noise filter resistor to speed up the settling time
+	Modify_SPI_Reg_bits (addrCSW_VCO , msb, lsb , 0); //Set SWC_VCO<7:0>=<00000000>
+
+	i=7;
+	while(i>=0)
+	{
+        Modify_SPI_Reg_bits (addrCSW_VCO, lsb + i, lsb + i, 1); // CSW_VCO<i>=1
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+        cmphl = (uint8_t)Get_SPI_Reg_bits(addrCMP, 13, 12);
+        if ( (cmphl&0x01) == 1) // reduce CSW
+            Modify_SPI_Reg_bits (addrCSW_VCO, lsb + i, lsb + i, 0); // CSW_VCO<i>=0
+        if( cmphl == 2 && csw_lowest < 0)
+            csw_lowest = Get_SPI_Reg_bits(addrCSW_VCO, msb, lsb);
+		--i;
+	}
+	if(csw_lowest >= 0)
+    {
+        uint16_t csw_highest = Get_SPI_Reg_bits(addrCSW_VCO, msb, lsb);
+        if(csw_lowest == csw_highest)
+        {
+            while(csw_lowest>=0)
+            {
+                Modify_SPI_Reg_bits(addrCSW_VCO, msb, lsb, csw_lowest);
+                std::this_thread::sleep_for(std::chrono::milliseconds(5));
+                if(Get_SPI_Reg_bits(addrCMP, 13, 12) == 0)
+                {
+                    ++csw_lowest;
+                    break;
+                }
+                else
+                    --csw_lowest;
+            }
+        }
+        Modify_SPI_Reg_bits(addrCSW_VCO, msb, lsb, csw_lowest+(csw_highest-csw_lowest)/2);
+    }
+    if (module == VCO_CGEN)
+        Modify_SPI_Reg_bits(LMS7param(SPDUP_VCO_CGEN), 0); //SHORT_NOISEFIL=1 SPDUP_VCO_ Short the noise filter resistor to speed up the settling time
+    else
+        Modify_SPI_Reg_bits(LMS7param(SPDUP_VCO), 0); //SHORT_NOISEFIL=1 SPDUP_VCO_ Short the noise filter resistor to speed up the settling time
+	cmphl = (uint8_t)Get_SPI_Reg_bits(addrCMP, 13, 12);
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //restore previously used channel
+	if(cmphl == 2)
+        return LIBLMS7_SUCCESS;
+    else
+        return LIBLMS7_FAILURE;
+}
+
+/** @brief Returns given parameter value from chip register
+    @param param LMS7002M control parameter
+    @param fromChip read directly from chip
+    @return parameter value
+*/
+uint16_t LMS7002M::Get_SPI_Reg_bits(const LMS7Parameter &param, bool fromChip)
+{
+	return Get_SPI_Reg_bits(param.address, param.msb, param.lsb, fromChip);
+}
+
+/** @brief Returns given parameter value from chip register
+    @param address register address
+    @param msb most significant bit index
+    @param lsb least significant bit index
+    @param fromChip read directly from chip
+    @return register bits from selected interval, shifted to right by lsb bits
+*/
+uint16_t LMS7002M::Get_SPI_Reg_bits(uint16_t address, uint8_t msb, uint8_t lsb, bool fromChip)
+{
+    return (SPI_read(address, fromChip) & (~(~0<<(msb+1)))) >> lsb; //shift bits to LSB
+}
+
+/** @brief Change given parameter value
+    @param param LMS7002M control parameter
+    @param fromChip read initial value directly from chip
+    @param value new parameter value
+*/
+liblms7_status LMS7002M::Modify_SPI_Reg_bits(const LMS7Parameter &param, const uint16_t value, bool fromChip)
+{
+    return Modify_SPI_Reg_bits(param.address, param.msb, param.lsb, value, fromChip);
+}
+
+/** @brief Change given parameter value
+    @param address register address
+    @param value new bits value, the value is shifted left by lsb bits
+    @param fromChip read initial value directly from chip
+*/
+liblms7_status LMS7002M::Modify_SPI_Reg_bits(const uint16_t address, const uint8_t msb, const uint8_t lsb, const uint16_t value, bool fromChip)
+{
+    uint16_t spiDataReg = SPI_read(address, fromChip); //read current SPI reg data
+    uint16_t spiMask = (~(~0 << (msb - lsb + 1))) << (lsb); // creates bit mask
+    spiDataReg = (spiDataReg & (~spiMask)) | ((value << lsb) & spiMask);//clear bits
+    return SPI_write(address, spiDataReg); //write modified data back to SPI reg
+}
+
+/** @brief Modifies given registers with values applied using masks
+    @param addr array of register addresses
+    @param masks array of applied masks
+    @param values array of values to be written
+    @param start starting index of given arrays
+    @param stop end index of given arrays
+*/
+liblms7_status LMS7002M::Modify_SPI_Reg_mask(const uint16_t *addr, const uint16_t *masks, const uint16_t *values, uint8_t start, uint8_t stop)
+{
+    liblms7_status status;
+    uint16_t reg_data;
+    vector<uint16_t> addresses;
+    vector<uint16_t> data;
+    while (start <= stop)
+    {
+        reg_data = SPI_read(addr[start], true, &status); //read current SPI reg data
+        reg_data &= ~masks[start];//clear bits
+        reg_data |= (values[start] & masks[start]);
+        addresses.push_back(addr[start]);
+        data.push_back(reg_data);
+        ++start;
+    }
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    SPI_write_batch(&addresses[0], &data[0], addresses.size());
+    return status;
+}
+
+/** @brief Sets SX frequency
+    @param Tx Rx/Tx module selection
+    @param freq_MHz desired frequency in MHz
+	@param refClk_MHz reference clock in MHz
+    @return 0-success, other-cannot deliver requested frequency
+*/
+liblms7_status LMS7002M::SetFrequencySX(bool tx, float_type freq_MHz, float_type refClk_MHz)
+{
+	if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+    const uint8_t sxVCO_N = 2; //number of entries in VCO frequencies
+    const float_type m_dThrF = 5500; //threshold to enable additional divider
+    uint8_t ch; //remember used channel
+    float_type VCOfreq;
+    int8_t div_loch;
+    int8_t sel_vco;
+    bool canDeliverFrequency = false;
+    uint16_t integerPart;
+    uint32_t fractionalPart;
+    int8_t i;
+
+    //find required VCO frequency
+    for (div_loch = 6; div_loch >= 0; --div_loch)
+    {
+        VCOfreq = (1 << (div_loch + 1)) * freq_MHz;
+        if ((VCOfreq >= gVCO_frequency_table[0][0]) && (VCOfreq <= gVCO_frequency_table[2][sxVCO_N - 1]))
+        {
+            canDeliverFrequency = true;
+            break;
+        }
+    }
+    if (canDeliverFrequency == false)
+        return LIBLMS7_CANNOT_DELIVER_FREQUENCY;
+
+    integerPart = (uint16_t)(VCOfreq / (refClk_MHz * (1 + (VCOfreq > m_dThrF))) - 4);
+    fractionalPart = (uint32_t)((VCOfreq / (refClk_MHz * (1 + (VCOfreq > m_dThrF))) - (uint32_t)(VCOfreq / (refClk_MHz * (1 + (VCOfreq > m_dThrF))))) * 1048576);
+
+    ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    Modify_SPI_Reg_bits(LMS7param(MAC), tx + 1);
+    Modify_SPI_Reg_bits(LMS7param(INT_SDM), integerPart); //INT_SDM
+    Modify_SPI_Reg_bits(0x011D, 15, 0, fractionalPart & 0xFFFF); //FRAC_SDM[15:0]
+    Modify_SPI_Reg_bits(0x011E, 3, 0, (fractionalPart >> 16)); //FRAC_SDM[19:16]
+    Modify_SPI_Reg_bits(LMS7param(DIV_LOCH), div_loch); //DIV_LOCH
+    Modify_SPI_Reg_bits(LMS7param(EN_DIV2_DIVPROG), (VCOfreq > m_dThrF)); //EN_DIV2_DIVPROG
+
+    //find which VCO supports required frequency
+    Modify_SPI_Reg_bits(LMS7param(PD_VCO), 0); //
+    Modify_SPI_Reg_bits(LMS7param(PD_VCO_COMP), 0); //
+    int cswBackup = Get_SPI_Reg_bits(LMS7param(CSW_VCO)); //remember to restore previous tune value
+    canDeliverFrequency = false;
+    int tuneScore[] = { -128, -128, -128 }; //best is closest to 0
+    for (sel_vco = 0; sel_vco < 3; ++sel_vco)
+    {
+        Modify_SPI_Reg_bits(LMS7param(SEL_VCO), sel_vco);
+        liblms7_status status = TuneVCO(tx ? VCO_SXT : VCO_SXR);
+        int csw = Get_SPI_Reg_bits(LMS7param(CSW_VCO), true);
+        tuneScore[sel_vco] = -128 + csw;
+        if (status == LIBLMS7_SUCCESS)
+            canDeliverFrequency = true;
+    }
+    if (abs(tuneScore[0]) < abs(tuneScore[1]))
+    {   
+        if (abs(tuneScore[0]) < abs(tuneScore[2]))
+            sel_vco = 0;
+        else
+            sel_vco = 2;
+    }
+    else
+    {
+        if (abs(tuneScore[1]) < abs(tuneScore[2]))
+            sel_vco = 1;
+        else
+            sel_vco = 2;
+    }
+    Modify_SPI_Reg_bits(LMS7param(SEL_VCO), sel_vco);
+    Modify_SPI_Reg_bits(LMS7param(CSW_VCO), cswBackup);
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //restore used channel
+    if (tx)
+        mRefClkSXT_MHz = refClk_MHz;
+    else
+        mRefClkSXR_MHz = refClk_MHz;
+    if (canDeliverFrequency == false)
+        return LIBLMS7_CANNOT_DELIVER_FREQUENCY;
+    return TuneVCO( tx ? VCO_SXT : VCO_SXR); //Rx-1, Tx-2
+}
+
+/**	@brief Returns currently set SXR/SXT frequency
+	@return SX frequency MHz
+*/
+float_type LMS7002M::GetFrequencySX_MHz(bool Tx, float_type refClk_MHz)
+{
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC)); //remember previously used channel
+	float_type dMul;
+	if(Tx)
+        Modify_SPI_Reg_bits(LMS7param(MAC), 2); // Rx mac = 1, Tx max = 2
+	else
+        Modify_SPI_Reg_bits(LMS7param(MAC), 1); // Rx mac = 1, Tx max = 2
+	uint16_t gINT = Get_SPI_Reg_bits(0x011E, 13, 0);	// read whole register to reduce SPI transfers
+    uint32_t gFRAC = ((gINT&0xF) * 65536) | Get_SPI_Reg_bits(0x011D, 15, 0);
+
+    dMul = (float_type)refClk_MHz / (1 << (Get_SPI_Reg_bits(LMS7param(DIV_LOCH)) + 1));
+    //Calculate real frequency according to the calculated parameters
+    dMul = dMul * ((gINT >> 4) + 4 + (float_type)gFRAC / 1048576.0) * (Get_SPI_Reg_bits(LMS7param(EN_DIV2_DIVPROG)) + 1);
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //restore used channel
+	return dMul;
+}
+
+/** @brief Loads given DC_REG values into registers
+    @param tx TxTSP or RxTSP selection
+    @param I DC_REG I value
+    @param Q DC_REG Q value
+*/
+liblms7_status LMS7002M::LoadDC_REG_IQ(bool tx, int16_t I, int16_t Q)
+{
+    if(tx)
+    {
+        Modify_SPI_Reg_bits(LMS7param(DC_REG_TXTSP), I);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_TXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_TXTSP), 1);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_TXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(DC_REG_TXTSP), Q);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_TXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_TXTSP), 1);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_TXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(DC_BYP_TXTSP), 0); //DC_BYP
+    }
+    else
+    {
+        Modify_SPI_Reg_bits(LMS7param(DC_REG_RXTSP), I);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_RXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_RXTSP), 1);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDI_RXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(DC_REG_TXTSP), Q);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_RXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_RXTSP), 1);
+        Modify_SPI_Reg_bits(LMS7param(TSGDCLDQ_RXTSP), 0);
+        Modify_SPI_Reg_bits(LMS7param(DC_BYP_RXTSP), 0); //DC_BYP
+    }
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Sets chosen NCO's frequency
+    @param tx transmitter or receiver selection
+    @param index NCO index from 0 to 15
+    @param freq_MHz desired NCO frequency
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SetNCOFrequency(bool tx, uint8_t index, float_type freq_MHz)
+{
+    if(index > 15)
+        return LIBLMS7_INDEX_OUT_OF_RANGE;
+    float_type refClk_MHz = GetReferenceClk_TSP_MHz(tx);
+    uint16_t addr = tx ? 0x0240 : 0x0440;
+	uint32_t fcw = (uint32_t)((freq_MHz/refClk_MHz)*4294967296);
+    SPI_write(addr+2+index*2, (fcw >> 16)); //NCO frequency control word register MSB part.
+    SPI_write(addr+3+index*2, fcw); //NCO frequency control word register LSB part.
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Returns chosen NCO's frequency in MHz
+    @param tx transmitter or receiver selection
+    @param index NCO index from 0 to 15
+    @param fromChip read frequency directly from chip or local registers
+    @return NCO frequency in MHz
+*/
+float_type LMS7002M::GetNCOFrequency_MHz(bool tx, uint8_t index, const float_type refClk_MHz, bool fromChip)
+{
+    if(index > 15)
+        return LIBLMS7_INDEX_OUT_OF_RANGE;
+    uint16_t addr = tx ? 0x0240 : 0x0440;
+    uint32_t fcw = 0;
+    fcw |= SPI_read(addr + 2 + index * 2, fromChip) << 16; //NCO frequency control word register MSB part.
+    fcw |= SPI_read(addr + 3 + index * 2, fromChip); //NCO frequency control word register LSB part.
+    return refClk_MHz*(fcw/4294967296.0);
+}
+
+/** @brief Sets chosen NCO phase offset angle when memory table MODE is 0
+@param tx transmitter or receiver selection
+@param angle_deg phase offset angle in degrees
+@return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SetNCOPhaseOffsetForMode0(bool tx, float_type angle_deg)
+{
+    uint16_t addr = tx ? 0x0241 : 0x0441;
+    uint16_t pho = (uint16_t)(65536 * (angle_deg / 360 ));
+    SPI_write(addr, pho);
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Sets chosen NCO's phase offset angle
+    @param tx transmitter or receiver selection
+    @param index PHO index from 0 to 15
+    @param angle_deg phase offset angle in degrees
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SetNCOPhaseOffset(bool tx, uint8_t index, float_type angle_deg)
+{
+    if(index > 15)
+        return LIBLMS7_INDEX_OUT_OF_RANGE;
+    uint16_t addr = tx ? 0x0244 : 0x0444;
+	uint16_t pho = (uint16_t)(65536*(angle_deg / 360));
+    SPI_write(addr+index, pho);
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Returns chosen NCO's phase offset angle in radians
+    @param tx transmitter or receiver selection
+    @param index PHO index from 0 to 15
+    @return phase offset angle in degrees
+*/
+float_type LMS7002M::GetNCOPhaseOffset_Deg(bool tx, uint8_t index)
+{
+    uint16_t addr = tx ? 0x0244 : 0x0444;
+    uint16_t pho = SPI_read(addr+index);
+    float_type angle = 360*pho/65536.0;
+    return angle;
+}
+
+/** @brief Uploads given FIR coefficients to chip
+    @param tx Transmitter or receiver selection
+    @param GFIR_index GIR index from 0 to 2
+    @param coef array of coefficients
+    @param coefCount number of coefficients
+    @return 0-success, other-failure
+
+    This function does not change GFIR*_L or GFIR*_N parameters, they have to be set manually
+*/
+liblms7_status LMS7002M::SetGFIRCoefficients(bool tx, uint8_t GFIR_index, const int16_t *coef, uint8_t coefCount)
+{
+    uint8_t index;
+    uint8_t coefLimit;
+    uint16_t startAddr;
+    if (GFIR_index == 0)
+        startAddr = 0x0280;
+    else if (GFIR_index == 1)
+        startAddr = 0x02C0;
+    else
+        startAddr = 0x0300;
+
+    if (tx == false)
+        startAddr += 0x0200;
+    if (GFIR_index < 2)
+        coefLimit = 40;
+    else
+        coefLimit = 120;
+    if (coefCount > coefLimit)
+        return LIBLMS7_TOO_MANY_VALUES;
+    vector<uint16_t> addresses;
+    for (index = 0; index < coefCount; ++index)
+        addresses.push_back(startAddr + index + 24 * (index / 40));
+    SPI_write_batch(&addresses[0], (uint16_t*)coef, coefCount);
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Returns currently loaded FIR coefficients
+    @param tx Transmitter or receiver selection
+    @param GFIR_index GIR index from 0 to 2
+    @param coef array of returned coefficients
+    @param coefCount number of coefficients to read
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::GetGFIRCoefficients(bool tx, uint8_t GFIR_index, int16_t *coef, uint8_t coefCount)
+{
+    liblms7_status status = LIBLMS7_FAILURE;
+    uint8_t index;
+    uint8_t coefLimit;
+    uint16_t startAddr;
+    if(GFIR_index == 0)
+        startAddr = 0x0280;
+    else if (GFIR_index == 1)
+        startAddr = 0x02C0;
+    else
+        startAddr = 0x0300;
+
+    if (tx == false)
+        startAddr += 0x0200;
+    if (GFIR_index < 2)
+        coefLimit = 40;
+    else
+        coefLimit = 120;
+    if (coefCount > coefLimit)
+        return LIBLMS7_TOO_MANY_VALUES;
+
+    std::vector<uint16_t> addresses;
+    for (index = 0; index < coefCount; ++index)
+        addresses.push_back(startAddr + index + 24 * (index / 40));
+    uint16_t spiData[120];
+    memset(spiData, 0, 120 * sizeof(uint16_t));
+    if (controlPort->IsOpen())
+    {
+        status = SPI_read_batch(&addresses[0], spiData, coefCount);
+        for (index = 0; index < coefCount; ++index)
+            coef[index] = spiData[index];
+    }
+    else
+    {
+        const int channel = Get_SPI_Reg_bits(LMS7param(MAC), false) > 1 ? 1 : 0;
+        for (index = 0; index < coefCount; ++index)
+            coef[index] = mRegistersMap->GetValue(channel, addresses[index]);
+        status = LIBLMS7_SUCCESS;
+    }
+    
+    return status;
+}
+
+/** @brief Write given data value to whole register
+    @param address SPI address
+    @param data new register value
+    @return 0-succes, other-failure
+*/
+liblms7_status LMS7002M::SPI_write(uint16_t address, uint16_t data)
+{
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+
+    if ((mRegistersMap->GetValue(0, LMS7param(MAC).address) & 0x0003) > 1 && address >= 0x0100)
+        mRegistersMap->SetValue(1, address, data);
+    else
+        mRegistersMap->SetValue(0, address, data);
+
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_LMS7002_WR;
+    pkt.outBuffer.push_back(address >> 8);
+    pkt.outBuffer.push_back(address & 0xFF);
+    pkt.outBuffer.push_back(data >> 8);
+    pkt.outBuffer.push_back(data & 0xFF);
+    controlPort->TransferPacket(pkt);
+    if (pkt.status == STATUS_COMPLETED_CMD)
+        return LIBLMS7_SUCCESS;
+    else
+        return LIBLMS7_FAILURE;
+}
+
+/** @brief Reads whole register value from given address
+    @param address SPI address
+    @param status operation status(optional)
+    @param fromChip read value directly from chip
+    @return register value
+*/
+uint16_t LMS7002M::SPI_read(uint16_t address, bool fromChip, liblms7_status *status)
+{
+    if (controlPort == NULL)
+    {
+        if (status)
+            *status = LIBLMS7_NO_CONNECTION_MANAGER;
+    }
+    if (controlPort->IsOpen() == false || fromChip == false)
+    {
+        if ((mRegistersMap->GetValue(0, LMS7param(MAC).address) & 0x0003) > 1 && address >= 0x0100)
+            return mRegistersMap->GetValue(1, address);
+        else
+            return mRegistersMap->GetValue(0, address);
+    }
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_LMS7002_RD;
+    pkt.outBuffer.push_back(address >> 8);
+    pkt.outBuffer.push_back(address & 0xFF);
+    if (controlPort->TransferPacket(pkt) == LMScomms::TRANSFER_SUCCESS)
+    {
+        if (status)
+            *status = (pkt.status == STATUS_COMPLETED_CMD ? LIBLMS7_SUCCESS : LIBLMS7_FAILURE);
+        return (pkt.inBuffer[2] << 8) | pkt.inBuffer[3];
+    }
+    else
+        return 0;
+}
+
+/** @brief Batches multiple register writes into least ammount of transactions
+    @param spiAddr spi register addresses to be written
+    @param spiData registers data to be written
+    @param cnt number of registers to write
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SPI_write_batch(const uint16_t* spiAddr, const uint16_t* spiData, uint16_t cnt)
+{
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_LMS7002_WR;
+    uint32_t index = 0;
+    for (uint32_t i = 0; i < cnt; ++i)
+    {
+        pkt.outBuffer.push_back(spiAddr[i] >> 8);
+        pkt.outBuffer.push_back(spiAddr[i] & 0xFF);
+        pkt.outBuffer.push_back(spiData[i] >> 8);
+        pkt.outBuffer.push_back(spiData[i] & 0xFF);
+
+        if ((mRegistersMap->GetValue(0, LMS7param(MAC).address) & 0x0003) > 1)
+            mRegistersMap->SetValue(1, spiAddr[i], spiData[i]);
+        else
+            mRegistersMap->SetValue(0, spiAddr[i], spiData[i]);
+
+    }
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    controlPort->TransferPacket(pkt);
+    if (pkt.status == STATUS_COMPLETED_CMD)
+        return LIBLMS7_SUCCESS;
+    else
+        return LIBLMS7_FAILURE;
+}
+
+/** @brief Batches multiple register reads into least amount of transactions
+    @param spiAddr SPI addresses to read
+    @param spiData array for read data
+    @param cnt number of registers to read
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SPI_read_batch(const uint16_t* spiAddr, uint16_t* spiData, uint16_t cnt)
+{
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_LMS7002_RD;
+    uint32_t index = 0;
+    for (uint32_t i = 0; i < cnt; ++i)
+    {
+        pkt.outBuffer.push_back(spiAddr[i] >> 8);
+        pkt.outBuffer.push_back(spiAddr[i] & 0xFF);
+    }
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    LMScomms::TransferStatus status = controlPort->TransferPacket(pkt);
+    if (status != LMScomms::TRANSFER_SUCCESS)
+        return LIBLMS7_FAILURE;
+
+    for (uint32_t i = 0; i < cnt; ++i)
+    {
+        spiData[i] = (pkt.inBuffer[2*sizeof(uint16_t)*i + 2] << 8) | pkt.inBuffer[2*sizeof(uint16_t)*i + 3];
+        if ((mRegistersMap->GetValue(0, LMS7param(MAC).address) & 0x0003) > 1)
+            mRegistersMap->SetValue(1, spiAddr[i], spiData[i]);
+        else
+            mRegistersMap->SetValue(0, spiAddr[i], spiData[i]);
+    }
+    return pkt.status == STATUS_COMPLETED_CMD ? LIBLMS7_SUCCESS : LIBLMS7_FAILURE;
+    /*
+    for(int i=0; i<cnt; ++i)
+    {
+        spiData[i] = Get_SPI_Reg_bits(spiAddr[i], 15, 0);
+        if ((mRegistersMap->GetValue(0, LMS7param(MAC).address) & 0x0003) > 1)
+            mRegistersMap->SetValue(1, spiAddr[i], spiData[i]);
+        else
+            mRegistersMap->SetValue(0, spiAddr[i], spiData[i]);
+    }
+    return LIBLMS7_SUCCESS;*/
+}
+
+/** @brief Performs registers test by writing known data and confirming readback data
+    @return 0-registers test passed, other-failure
+*/
+liblms7_status LMS7002M::RegistersTest()
+{
+    char chex[16];
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    liblms7_status status;
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+
+    //backup both channel data for restoration after test
+    vector<uint16_t> ch1Addresses;
+    for (uint8_t i = 0; i < MEMORY_SECTIONS_COUNT; ++i)
+        for (uint16_t addr = MemorySectionAddresses[i][0]; addr <= MemorySectionAddresses[i][1]; ++addr)
+            ch1Addresses.push_back(addr);
+    vector<uint16_t> ch1Data;
+    ch1Data.resize(ch1Addresses.size(), 0);
+
+    //backup A channel
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    status = SPI_read_batch(&ch1Addresses[0], &ch1Data[0], ch1Addresses.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    vector<uint16_t> ch2Addresses;
+    for (uint8_t i = 0; i < MEMORY_SECTIONS_COUNT; ++i)
+        for (uint16_t addr = MemorySectionAddresses[i][0]; addr <= MemorySectionAddresses[i][1]; ++addr)
+            if (addr >= 0x0100)
+                ch2Addresses.push_back(addr);
+    vector<uint16_t> ch2Data;
+    ch2Data.resize(ch2Addresses.size(), 0);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    status = SPI_read_batch(&ch2Addresses[0], &ch2Data[0], ch2Addresses.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    //test registers
+    ResetChip();
+    Modify_SPI_Reg_bits(LMS7param(MIMO_SISO), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_RX_AFE2), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_TX_AFE2), 0);
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+
+    stringstream ss;
+
+    //check single channel memory sections
+    vector<MemorySection> modulesToCheck = { AFE, BIAS, XBUF, CGEN, LDO, BIST, CDS, TRF, TBB, RFE, RBB, SX,
+        TxTSP, TxNCO, TxGFIR1, TxGFIR2, TxGFIR3a, TxGFIR3b, TxGFIR3c,
+        RxTSP, RxNCO, RxGFIR1, RxGFIR2, RxGFIR3a, RxGFIR3b, RxGFIR3c, LimeLight };
+    const char* moduleNames[] = { "AFE", "BIAS", "XBUF", "CGEN", "LDO", "BIST", "CDS", "TRF", "TBB", "RFE", "RBB", "SX",
+        "TxTSP", "TxNCO", "TxGFIR1", "TxGFIR2", "TxGFIR3a", "TxGFIR3b", "TxGFIR3c",
+        "RxTSP", "RxNCO", "RxGFIR1", "RxGFIR2", "RxGFIR3a", "RxGFIR3b", "RxGFIR3c", "LimeLight" };
+
+    const uint16_t patterns[] = { 0xAAAA, 0x5555 };
+    const uint8_t patternsCount = 2;
+
+    bool allTestSuccess = true;
+
+    for (unsigned i = 0; i < modulesToCheck.size(); ++i)
+    {
+        bool moduleTestsSuccess = true;
+        uint16_t startAddr = MemorySectionAddresses[modulesToCheck[i]][0];
+        uint16_t endAddr = MemorySectionAddresses[modulesToCheck[i]][1];
+        uint8_t channelCount = startAddr >= 0x0100 ? 2 : 1;
+        for (int cc = 1; cc <= channelCount; ++cc)
+        {
+            Modify_SPI_Reg_bits(LMS7param(MAC), cc);
+            sprintf(chex, "0x%04X", startAddr);
+            ss << moduleNames[i] << "  [" << chex << ":";
+            sprintf(chex, "0x%04X", endAddr);
+            ss << chex << "]";
+            if (startAddr >= 0x0100)
+                ss << " Ch." << (cc == 1 ? "A" : "B");
+                ss << endl;
+            for (uint8_t p = 0; p < patternsCount; ++p)
+                moduleTestsSuccess &= RegistersTestInterval(startAddr, endAddr, patterns[p], ss) == LIBLMS7_SUCCESS;
+        }
+        allTestSuccess &= moduleTestsSuccess;
+    }
+
+    //restore register values
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    SPI_write_batch(&ch1Addresses[0], &ch1Data[0], ch1Addresses.size());
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    SPI_write_batch(&ch2Addresses[0], &ch2Data[0], ch2Addresses.size());
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+
+    fstream fout;
+    fout.open("registersTest.txt", ios::out);
+    fout << ss.str() << endl;
+    fout.close();
+
+    return allTestSuccess ? LIBLMS7_SUCCESS : LIBLMS7_FAILURE;
+}
+
+/** @brief Performs registers test for given address interval by writing given pattern data
+    @param startAddr first register address
+    @param endAddr last reigster address
+    @param pattern data to be written into registers
+    @return 0-register test passed, other-failure
+*/
+liblms7_status LMS7002M::RegistersTestInterval(uint16_t startAddr, uint16_t endAddr, uint16_t pattern, stringstream &ss)
+{
+    vector<uint16_t> addrToWrite;
+    vector<uint16_t> dataToWrite;
+    vector<uint16_t> dataReceived;
+    vector<uint16_t> dataMasks;
+
+    for (uint16_t addr = startAddr; addr <= endAddr; ++addr)
+    {
+        addrToWrite.push_back(addr);
+    }
+    dataMasks.resize(addrToWrite.size(), 0xFFFF);
+    for (uint16_t j = 0; j < sizeof(readOnlyRegisters)/sizeof(uint16_t); ++j)
+        for (uint16_t k = 0; k < addrToWrite.size(); ++k)
+            if (readOnlyRegisters[j] == addrToWrite[k])
+            {
+                dataMasks[k] = readOnlyRegistersMasks[j];
+                break;
+            }
+
+    dataToWrite.clear();
+    dataReceived.clear();
+    for (uint16_t j = 0; j < addrToWrite.size(); ++j)
+    {
+        if (addrToWrite[j] == 0x00A6)
+            dataToWrite.push_back(0x1 | pattern & ~0x2);
+        else if (addrToWrite[j] == 0x0084)
+            dataToWrite.push_back(pattern & ~0x19);
+        else
+            dataToWrite.push_back(pattern & dataMasks[j]);
+    }
+    dataReceived.resize(addrToWrite.size(), 0);
+    liblms7_status status;
+    status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    status = SPI_read_batch(&addrToWrite[0], &dataReceived[0], addrToWrite.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    bool registersMatch = true;
+    char ctemp[16];
+    for (uint16_t j = 0; j < dataToWrite.size(); ++j)
+    {
+        if (dataToWrite[j] != (dataReceived[j] & dataMasks[j]))
+        {
+            registersMatch = false;
+            sprintf(ctemp, "0x%04X", addrToWrite[j]);
+            ss << "\t" << ctemp << "(wr/rd): ";
+            sprintf(ctemp, "0x%04X", dataToWrite[j]);
+            ss << ctemp << "/";
+            sprintf(ctemp, "0x%04X", dataReceived[j]);
+            ss << ctemp << endl;
+        }
+    }
+    if (registersMatch)
+    {
+        sprintf(ctemp, "0x%04X", pattern);
+        ss << "\tRegisters OK (" << ctemp << ")\n";
+    }
+    return registersMatch ? LIBLMS7_SUCCESS : LIBLMS7_FAILURE;
+}
+
+/** @brief Parameters setup instructions for Tx calibration
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::CalibrateTxSetup(float_type bandwidth_MHz)
+{
+    //Stage 2
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    uint8_t sel_band1_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF));
+    uint8_t sel_band2_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF));
+
+    //rfe
+    //reset RFE to defaults
+    SetDefaults(RFE);
+    if (sel_band1_trf == 1)
+        Modify_SPI_Reg_bits(LMS7param(SEL_PATH_RFE), 3); //SEL_PATH_RFE 3
+    else if (sel_band2_trf == 1)
+        Modify_SPI_Reg_bits(LMS7param(SEL_PATH_RFE), 2);
+    else
+        return LIBLMS7_BAND_NOT_SELECTED;
+
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTRX_RFE), 1); // EN_NEXTTX_RFE 1
+
+    Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), 8); //G_RXLOOPB_RFE 8
+    Modify_SPI_Reg_bits(0x010C, 4, 3, 0); //PD_MXLOBUF_RFE 0, PD_QGEN_RFE 0
+    Modify_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE), 10); //CCOMP_TIA_RFE 10
+    Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), 2600); //CFB_TIA_RFE 2600
+    Modify_SPI_Reg_bits(LMS7param(ICT_LODC_RFE), 31); //ICT_LODC_RFE 31
+    Modify_SPI_Reg_bits(LMS7param(PD_LNA_RFE), 1);
+
+    //RBB
+    //reset RBB to defaults
+    SetDefaults(RBB);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFL_RBB), 0); //PD_LPFL_RBB 0
+    Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 0); //RCC_CTL_LPFL_RBB 0
+    Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFL_RBB), 1500); //C_CTL_LPFL_RBB 1500
+    Modify_SPI_Reg_bits(LMS7param(G_PGA_RBB), 22); //G_PGA_RBB 22
+
+    //TRF
+    //reset TRF to defaults
+    //SetDefaults(TRF);
+    Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), 0); //L_LOOPB_TXPAD_TRF 0
+    Modify_SPI_Reg_bits(LMS7param(EN_LOOPB_TXPAD_TRF), 1); //EN_LOOPB_TXPAD_TRF 1
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TRF), 0); //EN_G_TRF 0
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTTX_TRF), 1); //EN_NEXTTX_TRF 1
+    Modify_SPI_Reg_bits(LMS7param(LOSS_LIN_TXPAD_TRF), 0); //LOSS_LIN_TXPAD_TRF 5
+    Modify_SPI_Reg_bits(LMS7param(LOSS_MAIN_TXPAD_TRF), 0); //LOSS_MAIN_TXPAD_TRF 5
+
+    //TBB
+    //reset TBB to defaults
+    /*SetDefaults(TBB);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), 9); //CG_IAMP_TBB 9
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1); //ICT_IAMP_FRP_TBB 1
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6); //ICT_IAMP_GG_FRP_TBB 6
+    Modify_SPI_Reg_bits(LMS7param(RCAL_LPFH_TBB), 125); //RCAL_LPFH_TBB 0
+    */
+    //AFE
+    //reset AFE to defaults
+    uint8_t isel_dac_afe =(uint8_t) Get_SPI_Reg_bits(LMS7param(ISEL_DAC_AFE));
+    SetDefaults(AFE);
+    Modify_SPI_Reg_bits(LMS7param(PD_RX_AFE2), 0); //PD_RX_AFE2 0
+    Modify_SPI_Reg_bits(LMS7param(ISEL_DAC_AFE), isel_dac_afe);
+
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(PD_TX_AFE2), 0);
+    //BIAS
+    uint16_t backup = Get_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS));
+    SetDefaults(BIAS);
+    Modify_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS), backup); //RP_CALIB_BIAS
+
+    //XBUF
+    Modify_SPI_Reg_bits(0x0085, 2, 0, 1); //PD_XBUF_RX 0, PD_XBUF_TX 0, EN_G_XBUF 1
+
+    //CGEN
+    //reset CGEN to defaults
+    SetDefaults(CGEN);
+    //power up VCO
+    Modify_SPI_Reg_bits(LMS7param(PD_VCO_CGEN), 0);
+
+    if (SetFrequencyCGEN(122.88) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+    if (TuneVCO(VCO_CGEN) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+
+    //SXR
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    SetDefaults(SX);
+    float_type SXTfreqMHz = GetFrequencySX_MHz(Tx, mRefClkSXT_MHz);
+
+    float_type SXRfreqMHz = SXTfreqMHz - bandwidth_MHz / 4 - 1;
+    if (SetFrequencySX(Rx, SXRfreqMHz, mRefClkSXR_MHz) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+    if (TuneVCO(VCO_SXR) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+
+    //SXT
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    Modify_SPI_Reg_bits(LMS7param(PD_LOCH_T2RBUF), 1); //PD_LOCH_T2RBUF 1
+    if (SetFrequencySX(Tx, SXTfreqMHz, mRefClkSXT_MHz) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+    if (TuneVCO(VCO_SXT) != LIBLMS7_SUCCESS)
+        return LIBLMS7_FAILURE;
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+
+    //TXTSP
+    SetDefaults(TxTSP);
+    Modify_SPI_Reg_bits(0x0200, 3, 2, 0x3); //TSGMODE 1, INSEL 1
+    Modify_SPI_Reg_bits(0x0208, 6, 4, 0x7); //GFIR3_BYP 1, GFIR2_BYP 1, GFIR1_BYP 1
+    LoadDC_REG_IQ(Tx, (int16_t)0x7FFF, (int16_t)0x8000);
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    Modify_SPI_Reg_bits(0x0440, 4, 0, 0); //TX SEL[3:0] = 0 & MODE = 0
+
+    float_type offset = 0.2;
+    if (bandwidth_MHz == 8)
+    {
+        //SXR
+        Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+        SetDefaults(SX);
+        float_type SXTfreqMHz = GetFrequencySX_MHz(Tx, mRefClkSXT_MHz);
+
+        float_type sxrFreq = SXTfreqMHz - bandwidth_MHz / 4 - 1 - offset;
+        if (SetFrequencySX(Rx, sxrFreq, mRefClkSXR_MHz) != LIBLMS7_SUCCESS)
+            return LIBLMS7_FAILURE;
+        SetNCOFrequency(Tx, 0, bandwidth_MHz / 4 + offset);
+    }
+    else
+        SetNCOFrequency(Tx, 0, bandwidth_MHz / 4);
+
+    //RXTSP
+    SetDefaults(RxTSP);
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1); //AGC_MODE 1
+    Modify_SPI_Reg_bits(0x040C, 7, 0, 0xBF);
+    Modify_SPI_Reg_bits(LMS7param(CAPSEL), 0);
+    Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), 0); //Decimation HBD ratio
+    Modify_SPI_Reg_bits(LMS7param(AGC_AVG_RXTSP), 0x7); //agc_avg iq corr
+
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Flips the CAPTURE bit and returns digital RSSI value
+*/
+uint32_t LMS7002M::GetRSSI()
+{
+    Modify_SPI_Reg_bits(LMS7param(CAPTURE), 0);
+    Modify_SPI_Reg_bits(LMS7param(CAPTURE), 1);
+    return (Get_SPI_Reg_bits(0x040F, 15, 0) << 2) | Get_SPI_Reg_bits(0x040E, 1, 0);
+}
+
+/** @brief Sets Rx Dc offsets by converting two's complementary numbers to sign and magnitude
+*/
+void LMS7002M::SetRxDCOFF(int8_t offsetI, int8_t offsetQ)
+{
+    uint16_t valToSend = 0;
+    if (offsetI < 0)
+        valToSend |= 0x40;
+    valToSend |= labs(offsetI);
+    valToSend = valToSend << 7;
+    if (offsetQ < 0)
+        valToSend |= 0x40;
+    valToSend |= labs(offsetQ);
+    SPI_write(0x010E, valToSend);
+}
+
+/** @brief Calibrates Transmitter. DC correction, IQ gains, IQ phase correction
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::CalibrateTx(float_type bandwidth_MHz)
+{
+    liblms7_status status;
+    Log("Tx calibration started", LOG_INFO);
+    BackupAllRegisters();
+
+    int16_t iqcorr = 0;
+    uint16_t gcorrq = 0;
+    uint16_t gcorri = 0;
+    uint16_t dccorri;
+    uint16_t dccorrq;
+    int16_t corrI = 0;
+    int16_t corrQ = 0;
+    uint32_t minRSSI_i;
+    uint32_t minRSSI_q;
+    uint32_t minRSSI_iq;
+    int16_t i;
+    int16_t offsetI = 0;
+    int16_t offsetQ = 0;
+
+    const short firCoefs[] =
+    {
+        -2531,
+        -517,
+        2708,
+        188,
+        -3059,
+        216,
+        3569,
+        -770,
+        -4199,
+        1541,
+        4886,
+        -2577,
+        -5552,
+        3909,
+        6108,
+        -5537,
+        -6457,
+        7440,
+        6507,
+        -9566,
+        -6174,
+        11845,
+        5391,
+        -14179,
+        -4110,
+        16457,
+        2310,
+        -18561,
+        0,
+        20369,
+        -2780,
+        -21752,
+        5963,
+        22610,
+        -9456,
+        -22859,
+        13127,
+        22444,
+        -16854,
+        -21319,
+        20489,
+        19492,
+        -23883,
+        -17002,
+        26881,
+        13902,
+        -29372,
+        -10313,
+        31226,
+        6345,
+        -32380,
+        -2141,
+        32767,
+        -2141,
+        -32380,
+        6345,
+        31226,
+        -10313,
+        -29372,
+        13902,
+        26881,
+        -17002,
+        -23883,
+        19492,
+        20489,
+        -21319,
+        -16854,
+        22444,
+        13127,
+        -22859,
+        -9456,
+        22610,
+        5963,
+        -21752,
+        -2780,
+        20369,
+        0,
+        -18561,
+        2310,
+        16457,
+        -4110,
+        -14179,
+        5391,
+        11845,
+        -6174,
+        -9566,
+        6507,
+        7440,
+        -6457,
+        -5537,
+        6108,
+        3909,
+        -5552,
+        -2577,
+        4886,
+        1541,
+        -4199,
+        -770,
+        3569,
+        216,
+        -3059,
+        188,
+        2708,
+        -517,
+        -2531
+    };
+
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    //Stage 1
+    uint8_t sel_band1_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF));
+    uint8_t sel_band2_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF));
+    Log("Setup stage", LOG_INFO);
+    status = CalibrateTxSetup(bandwidth_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        goto TxCalibrationEnd; //go to ending stage to restore registers
+
+    //Stage 3
+    //Calibrate Rx DC
+    Log("Rx DC calibration", LOG_INFO);
+    {
+        uint16_t requiredRegs[] = { 0x0400, 0x040A, 0x010D, 0x040C };
+        uint16_t requiredMask[] = { 0x6000, 0x3007, 0x0040, 0x00FF }; //CAPSEL, AGC_MODE, AGC_AVG, EN_DCOFF, Bypasses
+        uint16_t requiredValue[] = { 0x0000, 0x1007, 0x0040, 0x00BD };
+
+        Modify_SPI_Reg_mask(requiredRegs, requiredMask, requiredValue, 0, 3);
+    }
+
+    for (i = 0; i<6; ++i)
+    {
+        FindMinRSSI(LMS7param(DCOFFI_RFE), offsetI, &offsetI, 3, 2, 32 >> i);
+        FindMinRSSI(LMS7param(DCOFFQ_RFE), offsetQ, &offsetQ, 3, 2, 32 >> i);
+    }
+    SetRxDCOFF((int8_t)offsetI, (int8_t)offsetQ);
+    Modify_SPI_Reg_bits(LMS7param(DC_BYP_RXTSP), 0); // DC_BYP 0
+
+    sel_band1_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF));
+    sel_band2_trf = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF));
+    //B
+    Modify_SPI_Reg_bits(0x0100, 0, 0, 1); //EN_G_TRF 1
+    if (sel_band1_trf == 1)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_1_RFE), 0); //PD_RLOOPB_1_RFE 0
+        Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB1_RFE), 0); //EN_INSHSW_LB1 0
+    }
+    if (sel_band2_trf == 1)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_2_RFE), 0); //PD_RLOOPB_2_RFE 0
+        Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB2_RFE), 0); // EN_INSHSW_LB2 0
+    }
+    FixRXSaturation();
+
+    Modify_SPI_Reg_bits(LMS7param(GFIR3_BYP_RXTSP), 0); //GFIR3_BYP 0
+    Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), 2);
+    Modify_SPI_Reg_bits(LMS7param(GFIR3_L_RXTSP), 7);
+    Modify_SPI_Reg_bits(LMS7param(GFIR3_N_RXTSP), 7);
+
+    SetGFIRCoefficients(Rx, 2, firCoefs, sizeof(firCoefs) / sizeof(int16_t));
+
+    Log("IQ correction stage", LOG_INFO);
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), 2047);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), 2047);
+
+    Modify_SPI_Reg_bits(LMS7param(IQCORR_TXTSP), 0);
+
+    Log("I gain", LOG_INFO);
+    minRSSI_i = FindMinRSSI_Gain(LMS7param(GCORRI_TXTSP), &gcorri);
+
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), 2047);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), 2047);
+
+    Log("Q gain", LOG_INFO);
+    minRSSI_q = FindMinRSSI_Gain(LMS7param(GCORRQ_TXTSP), &gcorrq);
+
+    if (minRSSI_i < minRSSI_q)
+        gcorrq = 2047;
+    else
+        gcorri = 2047;
+
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), gcorri);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), gcorrq);
+
+    Log("Phase", LOG_INFO);
+    iqcorr = 0;
+    for (uint8_t i = 0; i<9; ++i)
+        minRSSI_iq = FindMinRSSI(LMS7param(IQCORR_TXTSP), iqcorr, &iqcorr, 3, 1, 256 >> i);
+
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), gcorri);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), gcorrq);
+    Modify_SPI_Reg_bits(LMS7param(IQCORR_TXTSP), iqcorr);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    status = SetFrequencySX(Rx, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz)-1, mRefClkSXR_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        goto TxCalibrationEnd; //go to ending stage to restore registers
+
+    //C
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1);
+    Modify_SPI_Reg_bits(LMS7param(CAPSEL), 0);
+
+    Log("TX LO calibration", LOG_INFO);
+
+    //Calibrate Tx DC
+    for (uint8_t i = 0; i<7; ++i)
+    {
+        FindMinRSSI(LMS7param(DCCORRI_TXTSP), corrI, &corrI, 3, 1, 64 >> i);
+        FindMinRSSI(LMS7param(DCCORRQ_TXTSP), corrQ, &corrQ, 3, 1, 64 >> i);
+    }
+
+    dccorri = Get_SPI_Reg_bits(LMS7param(DCCORRI_TXTSP));
+    dccorrq = Get_SPI_Reg_bits(LMS7param(DCCORRQ_TXTSP));
+
+    // Stage 4
+TxCalibrationEnd:
+    Log("Restoring registers state", LOG_INFO);
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    RestoreAllRegisters();
+    if (status != LIBLMS7_SUCCESS)
+    {
+        Log("Tx calibration failed", LOG_WARNING);
+        return status;
+    }
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    Modify_SPI_Reg_bits(LMS7param(DCCORRI_TXTSP), dccorri);
+    Modify_SPI_Reg_bits(LMS7param(DCCORRQ_TXTSP), dccorrq);
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), gcorri);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), gcorrq);
+    Modify_SPI_Reg_bits(LMS7param(IQCORR_TXTSP), iqcorr);
+
+    Modify_SPI_Reg_bits(LMS7param(DC_BYP_TXTSP), 0); //DC_BYP
+    Modify_SPI_Reg_bits(0x0208, 1, 0, 0); //GC_BYP PH_BYP
+    Log("Tx calibration finished", LOG_INFO);
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Performs Rx DC offsets calibration
+*/
+void LMS7002M::CalibrateRxDC_RSSI()
+{
+    int16_t i;
+    int16_t offsetI = 0;
+    int16_t offsetQ = 0;
+    uint16_t requiredRegs[] = { 0x0400, 0x040A, 0x010D, 0x040C };
+    uint16_t requiredMask[] = { 0x6000, 0x3007, 0x0040, 0x00FF }; //CAPSEL, AGC_MODE, AGC_AVG, EN_DCOFF, Bypasses
+    uint16_t requiredValue[] = { 0x0000, 0x1007, 0x0040, 0x00BD };
+
+    Modify_SPI_Reg_mask(requiredRegs, requiredMask, requiredValue, 0, 3);
+    for (i = 0; i<6; ++i)
+    {
+        FindMinRSSI(LMS7param(DCOFFI_RFE), offsetI, &offsetI, 3, 2, 32 >> i);
+        FindMinRSSI(LMS7param(DCOFFQ_RFE), offsetQ, &offsetQ, 3, 2, 32 >> i);
+    }
+    Modify_SPI_Reg_bits(LMS7param(EN_DCOFF_RXFE_RFE), 1);
+    SetRxDCOFF((int8_t)offsetI, (int8_t)offsetQ);
+    Modify_SPI_Reg_bits(LMS7param(DC_BYP_RXTSP), 0); // DC_BYP 0
+}
+
+/** @brief Tries to detect and fix gains if Rx is saturated
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::FixRXSaturation()
+{
+    uint8_t g_rxloopb = 0;
+    Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), g_rxloopb);
+    Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), 3);
+
+    int8_t lLoopb = 3;
+    const uint32_t rssi_saturation_level = 0xD000;
+    while (g_rxloopb < 15)
+    {
+        g_rxloopb += 1;
+        Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), g_rxloopb);
+        Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), 3);
+        if (GetRSSI() < rssi_saturation_level)
+        {
+            for (lLoopb = 3; lLoopb >= 0; --lLoopb)
+            {
+                Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), lLoopb);
+                if (GetRSSI() > rssi_saturation_level)
+                {
+                    ++lLoopb;
+                    Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), lLoopb);
+                    goto finished;
+                }
+            }
+        }
+        else
+        {
+            g_rxloopb -= 1;
+            Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), g_rxloopb);
+            break;
+        }
+    }
+finished:
+    return GetRSSI() < rssi_saturation_level ? LIBLMS7_SUCCESS : LIBLMS7_FAILURE;
+}
+
+uint32_t LMS7002M::FindMinRSSI(const LMS7Parameter &param, const int16_t startValue, int16_t *result, const uint8_t scanWidth, const uint8_t twoCompl, int8_t stepMult)
+{
+    return FindMinRSSI(param.address, param.msb, param.lsb, startValue, result, scanWidth, twoCompl, stepMult);
+}
+
+/** @brief Searches for minimal RSSI value while changing given address bits
+@param addr address of parameter being changed
+@param msb most significant bit index
+@param lsb least significant bit index
+@param startValue initial value where to start search
+@param result found minimal parameter value will be set here
+@param twoCompl varying parameter value is treated as two's complement
+@return found minimal RSSI value
+*/
+uint32_t LMS7002M::FindMinRSSI(const uint16_t addr, const uint8_t msb, const uint8_t lsb, const int16_t startValue, int16_t *result, const uint8_t scanWidth, const uint8_t twoCompl, int8_t stepMult)
+{
+    if (scanWidth < 1)
+        return ~0;
+    int minI;
+    int min = startValue;
+    int globMin = 0;
+    uint32_t minRSSI = ~0;
+    unsigned int *rssiField = new unsigned int[scanWidth];
+    int minRSSIindex;
+    int i;
+    int maxVal;
+    int minVal = 0;
+    if (twoCompl)
+    {
+        maxVal = (~(~0x0 << (msb - lsb + 1))) / 2;
+        minVal = -(~(~0x0 << (msb - lsb + 1))) / 2 - 1;
+    }
+    else
+        maxVal = (~(~0x0 << (msb - lsb + 1)));
+
+    Modify_SPI_Reg_bits(addr, msb, lsb, startValue);
+
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1);
+    Modify_SPI_Reg_bits(LMS7param(CAPSEL), 0);
+
+    minRSSIindex = 0;
+    for (i = 0; i<scanWidth; ++i)
+    {
+        short currentValue = min + (i - scanWidth / 2)*stepMult;
+        if (currentValue < minVal)
+            currentValue = minVal;
+        else if (currentValue > maxVal)
+            currentValue = maxVal;
+        if (twoCompl == 2)
+        {
+            uint16_t valToSend = 0;
+            if (currentValue < 0)
+                valToSend |= 0x40;
+            valToSend |= labs(currentValue);
+            Modify_SPI_Reg_bits(addr, msb, lsb, valToSend);
+        }
+        else
+            Modify_SPI_Reg_bits(addr, msb, lsb, currentValue);
+
+        rssiField[i] = GetRSSI();
+    }
+    minI = min;
+    minRSSIindex = 0;
+    for (i = 0; i<scanWidth; ++i)
+        if (rssiField[i] < minRSSI)
+        {
+            minRSSI = rssiField[i];
+            minRSSIindex = i;
+            minI = min + (i - scanWidth / 2)*stepMult;
+            if (minI > maxVal)
+                minI = maxVal;
+            else if (minI < minVal)
+                minI = minVal;
+            globMin = minI;
+        }
+    min = minI;
+
+    Modify_SPI_Reg_bits(addr, msb, lsb, min);
+
+    *result = min;
+    return minRSSI;
+}
+
+/** @brief Sets given module registers to default values
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::SetDefaults(MemorySection module)
+{
+    liblms7_status status = LIBLMS7_SUCCESS;
+    vector<uint16_t> addrs;
+    vector<uint16_t> values;
+    for(uint32_t address = MemorySectionAddresses[module][0]; address <= MemorySectionAddresses[module][1]; ++address)
+    {
+        addrs.push_back(address);
+        values.push_back(mRegistersMap->GetDefaultValue(address));
+    }
+    status = SPI_write_batch(&addrs[0], &values[0], addrs.size());
+    return status;
+}
+
+/** @brief Parameters setup instructions for Rx calibration
+    @param bandwidth_MHz filter bandwidth in MHz
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::CalibrateRxSetup(float_type bandwidth_MHz)
+{
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+
+    //rfe
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTTX_TRF), 1); // EN_NEXTTX_TRF 0
+
+    Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), 15); //G_RXLOOPB_RFE 15
+    Modify_SPI_Reg_bits(0x010C, 4, 3, 0); //PD_MXLOBUF_RFE 0, PD_QGEN_RFE 0
+    Modify_SPI_Reg_bits(0x010C, 1, 1, 0); //PD_TIA 0
+    Modify_SPI_Reg_bits(0x010C, 7, 7, 1); //PD_LNA 1
+
+    Modify_SPI_Reg_bits(0x0110, 4, 0, 31); //ICT_LO_RFE 31
+    Modify_SPI_Reg_bits(0x010D, 4, 1, 0xFF); // all short switches are enabled
+
+    //RBB
+    Modify_SPI_Reg_bits(0x0115, 15, 14, 0); //Loopback switches disable
+    Modify_SPI_Reg_bits(0x0119, 15, 15, 0); //OSW_PGA 0
+
+    //TRF
+    //reset TRF to defaults
+    SetDefaults(TRF);
+    Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), 0); //L_LOOPB_TXPAD_TRF 0
+    Modify_SPI_Reg_bits(LMS7param(EN_LOOPB_TXPAD_TRF), 1); //EN_LOOPB_TXPAD_TRF 1
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TRF), 0); //EN_G_TRF 0
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTTX_TRF), 1); //EN_NEXTTX_TRF 1
+    Modify_SPI_Reg_bits(LMS7param(LOSS_LIN_TXPAD_TRF), 0); //LOSS_LIN_TXPAD_TRF 5
+    Modify_SPI_Reg_bits(LMS7param(LOSS_MAIN_TXPAD_TRF), 0); //LOSS_MAIN_TXPAD_TRF 5
+
+    //TBB
+    //reset TBB to defaults
+    SetDefaults(TBB);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), 9); //CG_IAMP_TBB 9
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1); //ICT_IAMP_FRP_TBB 1
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6); //ICT_IAMP_GG_FRP_TBB 6
+
+    //AFE
+    //reset AFE to defaults
+    SetDefaults(AFE);
+    Modify_SPI_Reg_bits(LMS7param(PD_RX_AFE2), 0); //PD_RX_AFE2
+    if (ch == 2)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_TX_AFE2), 0); //PD_TX_AFE2
+    }
+    //BIAS
+    uint16_t backup = Get_SPI_Reg_bits(0x0084, 10, 6);
+    SetDefaults(BIAS);
+    Modify_SPI_Reg_bits(0x0084, 10, 6, backup); //RP_CALIB_BIAS
+
+    //XBUF
+    Modify_SPI_Reg_bits(0x0085, 2, 0, 1); //PD_XBUF_RX 0, PD_XBUF_TX 0, EN_G_XBUF 1
+
+    //CGEN
+    //reset CGEN to defaults
+    SetDefaults(CGEN);
+    //power up VCO
+    Modify_SPI_Reg_bits(0x0086, 2, 2, 0);
+
+    liblms7_status status = SetFrequencyCGEN(122.88);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    //    //SXR
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    float_type SXRfreqMHz = GetFrequencySX_MHz(Rx, mRefClkSXR_MHz);
+
+    //SXT
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    Modify_SPI_Reg_bits(LMS7param(PD_LOCH_T2RBUF), 1); //PD_LOCH_t2RBUF 1
+    status = SetFrequencySX(Tx, SXRfreqMHz + bandwidth_MHz / 4, mRefClkSXT_MHz);
+    if ( status != LIBLMS7_SUCCESS)
+        return status;
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+
+    //TXTSP
+    SetDefaults(TxTSP);
+    Modify_SPI_Reg_bits(0x0200, 3, 2, 0x3); //TSGMODE 1, INSEL 1
+    //Modify_SPI_Reg_bits(0x0208, 6, 4, 0xFFFF); //GFIR3_BYP 1, GFIR2_BYP 1, GFIR1_BYP 1
+    Modify_SPI_Reg_bits(0x0208, 6, 6, 1); //GFIR3_BYP 1, GFIR2_BYP 1, GFIR1_BYP 1
+    Modify_SPI_Reg_bits(0x0208, 5, 5, 1); //GFIR3_BYP 1, GFIR2_BYP 1, GFIR1_BYP 1
+    Modify_SPI_Reg_bits(0x0208, 4, 4, 1); //GFIR3_BYP 1, GFIR2_BYP 1, GFIR1_BYP 1
+    LoadDC_REG_IQ(Tx, (int16_t)0x7FFF, (int16_t)0x8000);
+    SetNCOFrequency(Tx, 0, 0);
+
+    //RXTSP
+    SetDefaults(RxTSP);
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1); //AGC_MODE 1
+    Modify_SPI_Reg_bits(0x040C, 7, 7, 0x1); //CMIX_BYP 1
+    Modify_SPI_Reg_bits(0x040C, 6, 6, 0x0); //AGC_BYP 0
+    Modify_SPI_Reg_bits(0x040C, 5, 5, 1); //
+    Modify_SPI_Reg_bits(0x040C, 4, 4, 1); //
+    Modify_SPI_Reg_bits(0x040C, 3, 3, 1); //
+    Modify_SPI_Reg_bits(0x040C, 2, 2, 1); // DC_BYP
+    Modify_SPI_Reg_bits(0x040C, 1, 1, 1); //
+    Modify_SPI_Reg_bits(0x040C, 0, 0, 1); //
+
+    Modify_SPI_Reg_bits(LMS7param(CAPSEL), 0);
+    Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), 2);
+    Modify_SPI_Reg_bits(LMS7param(AGC_AVG_RXTSP), 0x7); //agc_avg iq corr
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Calibrates Receiver. DC offset, IQ gains, IQ phase correction
+    @return 0-success, other-failure
+*/
+liblms7_status LMS7002M::CalibrateRx(float_type bandwidth_MHz)
+{
+    liblms7_status status;
+    uint32_t minRSSI_i;
+    uint32_t minRSSI_q;
+    int16_t iqcorr_rx = 0;
+    uint32_t minRSSI_iq;
+    int16_t dcoffi;
+    int16_t dcoffq;
+
+    const int16_t firCoefs[] =
+    {
+        -2531,
+        -517,
+        2708,
+        188,
+        -3059,
+        216,
+        3569,
+        -770,
+        -4199,
+        1541,
+        4886,
+        -2577,
+        -5552,
+        3909,
+        6108,
+        -5537,
+        -6457,
+        7440,
+        6507,
+        -9566,
+        -6174,
+        11845,
+        5391,
+        -14179,
+        -4110,
+        16457,
+        2310,
+        -18561,
+        0,
+        20369,
+        -2780,
+        -21752,
+        5963,
+        22610,
+        -9456,
+        -22859,
+        13127,
+        22444,
+        -16854,
+        -21319,
+        20489,
+        19492,
+        -23883,
+        -17002,
+        26881,
+        13902,
+        -29372,
+        -10313,
+        31226,
+        6345,
+        -32380,
+        -2141,
+        32767,
+        -2141,
+        -32380,
+        6345,
+        31226,
+        -10313,
+        -29372,
+        13902,
+        26881,
+        -17002,
+        -23883,
+        19492,
+        20489,
+        -21319,
+        -16854,
+        22444,
+        13127,
+        -22859,
+        -9456,
+        22610,
+        5963,
+        -21752,
+        -2780,
+        20369,
+        0,
+        -18561,
+        2310,
+        16457,
+        -4110,
+        -14179,
+        5391,
+        11845,
+        -6174,
+        -9566,
+        6507,
+        7440,
+        -6457,
+        -5537,
+        6108,
+        3909,
+        -5552,
+        -2577,
+        4886,
+        1541,
+        -4199,
+        -770,
+        3569,
+        216,
+        -3059,
+        188,
+        2708,
+        -517,
+        -2531
+    };
+
+    Log("Rx calibration started", LOG_INFO);
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    Log("Saving registers state", LOG_INFO);
+    BackupAllRegisters();
+    uint8_t sel_path_rfe = (uint8_t)Get_SPI_Reg_bits(LMS7param(SEL_PATH_RFE));
+    if (sel_path_rfe == 1 || sel_path_rfe == 0)
+        return LIBLMS7_BAD_SEL_PATH;
+
+    Log("Setup stage", LOG_INFO);
+    status = CalibrateRxSetup(bandwidth_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        goto RxCalibrationEndStage;
+
+    Log("Rx DC calibration", LOG_INFO);
+    CalibrateRxDC_RSSI();
+    dcoffi = Get_SPI_Reg_bits(LMS7param(DCOFFI_RFE));
+    dcoffq = Get_SPI_Reg_bits(LMS7param(DCOFFQ_RFE));
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TRF), 1);
+
+    if (sel_path_rfe == 2)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_2_RFE), 0);
+        Modify_SPI_Reg_bits(0x0103, 10, 10, 1);
+        Modify_SPI_Reg_bits(0x0103, 11, 11, 0);
+        Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB2_RFE), 0);
+    }
+    if (sel_path_rfe == 3)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_1_RFE), 0);
+        Modify_SPI_Reg_bits(0x0103, 11, 11, 1);
+        Modify_SPI_Reg_bits(0x0103, 10, 10, 0);
+        Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB1_RFE), 0);
+    }
+
+    Modify_SPI_Reg_bits(0x040C, 7, 7, 0); //CMIX_BYP 0
+    Modify_SPI_Reg_bits(0x040C, 2, 0, 0); //DC_BYP 0, GC_BYP 0, PH_BYP 0
+    Modify_SPI_Reg_bits(LMS7param(CMIX_GAIN_RXTSP), 1); //CMIX_GAIN 1  +6 db
+    Modify_SPI_Reg_bits(0x040C, 13, 13, 1); //CMIX_SC 1
+
+    FixRXSaturation();
+
+    Modify_SPI_Reg_bits(0x040C, 5, 5, 0); //GFIR3_BYP 0
+    Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), 2);
+    Modify_SPI_Reg_bits(LMS7param(GFIR3_L_RXTSP), 7);
+    Modify_SPI_Reg_bits(LMS7param(GFIR3_N_RXTSP), 7);
+
+    SetGFIRCoefficients(Rx, 2, firCoefs, sizeof(firCoefs) / sizeof(int16_t));
+
+    SetNCOFrequency(Rx, 0, bandwidth_MHz / 4 + 1);
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_RXTSP), 2047);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_RXTSP), 2047);
+
+    Log("IQ correction stage", LOG_INFO);
+    iqcorr_rx = 0;
+    for (int i = 0; i<9; ++i)
+        minRSSI_iq = FindMinRSSI(LMS7param(IQCORR_RXTSP), iqcorr_rx, &iqcorr_rx, 3, 1, 256 >> i);
+    Modify_SPI_Reg_bits(LMS7param(IQCORR_RXTSP), iqcorr_rx);
+
+    uint16_t mingcorri;
+    Log("I gain", LOG_INFO);
+    minRSSI_i = FindMinRSSI_Gain(LMS7param(GCORRI_RXTSP), &mingcorri);
+
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_RXTSP), 2047);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_RXTSP), 2047);
+
+    Log("Q gain", LOG_INFO);
+    uint16_t mingcorrq;
+    minRSSI_q = FindMinRSSI_Gain(LMS7param(GCORRQ_RXTSP), &mingcorrq);
+
+    if (minRSSI_i < minRSSI_q)
+        mingcorrq = 2047;
+    else
+        mingcorri = 2047;
+
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_RXTSP), mingcorri);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_RXTSP), mingcorrq);
+
+    Log("Phase", LOG_INFO);
+    for (int i = 0; i<9; ++i)
+        minRSSI_iq = FindMinRSSI(LMS7param(IQCORR_RXTSP), iqcorr_rx, &iqcorr_rx, 3, 1, 256 >> i);
+
+RxCalibrationEndStage:
+    Log("Restoring registers state", LOG_INFO);
+    RestoreAllRegisters();
+    if (status != LIBLMS7_SUCCESS)
+    {
+        Log("Rx calibration failed", LOG_WARNING);
+        return status;
+    }
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    SetRxDCOFF((int8_t)dcoffi, (int8_t)dcoffq);
+    Modify_SPI_Reg_bits(LMS7param(EN_DCOFF_RXFE_RFE), 1);
+    Modify_SPI_Reg_bits(LMS7param(GCORRI_RXTSP), mingcorri);
+    Modify_SPI_Reg_bits(LMS7param(GCORRQ_RXTSP), mingcorrq);
+    Modify_SPI_Reg_bits(LMS7param(IQCORR_RXTSP), iqcorr_rx);
+    Modify_SPI_Reg_bits(0x040C, 2, 0, 0); //DC_BYP 0, GC_BYP 0, PH_BYP 0
+    Modify_SPI_Reg_bits(0x0110, 4, 0, 31); //ICT_LO_RFE 31
+    Log("Rx calibration finished", LOG_INFO);
+    return LIBLMS7_SUCCESS;
+}
+
+const uint16_t backupAddrs[] = {
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
+    0x0029, 0x002A, 0x002B, 0x002C, 0x002E, 0x0081, 0x0082, 0x0084, 0x0085,
+    0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x0092, 0x0093, 0x0094,
+    0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E,
+    0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8,
+    0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0100, 0x0101, 0x0102, 0x0103,
+    0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0109, 0x010A, 0x010C, 0x010D, 0x010E,
+    0x010F, 0x0110, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118,
+    0x0119, 0x011A, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120, 0x0121, 0x0122, 0x0123,
+    0x0124, 0x0200, 0x0201, 0x0202, 0x0203, 0x0204, 0x0205, 0x0206, 0x0207, 0x0208,
+    0x0240, 0x0242, 0x0243, 0x0400, 0x0401, 0x0402,
+    0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C,
+    0x0440, 0x0442, 0x0443 };
+uint16_t backupRegs[sizeof(backupAddrs) / 2];
+const uint16_t backupSXAddr[] = { 0x011C, 0x011D, 0x011E, 0x011F, 0x01200, 0x0121, 0x0122, 0x0123, 0x0124 };
+uint16_t backupRegsSXR[sizeof(backupSXAddr) / 2];
+uint16_t backupRegsSXT[sizeof(backupSXAddr) / 2];
+
+/** @brief Stores chip current registers state into memory for later restoration
+*/
+void LMS7002M::BackupAllRegisters()
+{
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    SPI_read_batch(backupAddrs, backupRegs, sizeof(backupAddrs) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1); // channel A
+    SPI_read_batch(backupSXAddr, backupRegsSXR, sizeof(backupRegsSXR) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2); // channel B
+    SPI_read_batch(backupSXAddr, backupRegsSXT, sizeof(backupRegsSXR) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+}
+
+/** @brief Sets chip registers to state that was stored in memory using BackupAllRegisters()
+*/
+void LMS7002M::RestoreAllRegisters()
+{
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+    SPI_write_batch(backupAddrs, backupRegs, sizeof(backupAddrs) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1); // channel A
+    SPI_write_batch(backupSXAddr, backupRegsSXR, sizeof(backupRegsSXR) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2); // channel B
+    SPI_write_batch(backupSXAddr, backupRegsSXT, sizeof(backupRegsSXR) / sizeof(uint16_t));
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+}
+
+/** @brief Searches for minimal digital RSSI value by changing given gain parameter
+    @param param LMS7002M gain correction parameter
+    @param foundValue returns value which achieved minimal RSSI
+    @return minimal found RSSI value
+*/
+uint32_t LMS7002M::FindMinRSSI_Gain(const LMS7Parameter &param, uint16_t *foundValue)
+{
+    uint32_t RSSI = ~0 - 2;
+    uint32_t prevRSSI = RSSI + 1;
+    uint8_t decrement = 2;
+    uint16_t gcorr = 2047;
+    while (gcorr > 1024)
+    {
+        Modify_SPI_Reg_bits(param, gcorr);
+        RSSI = GetRSSI();
+        if (RSSI < prevRSSI)
+        {
+            prevRSSI = RSSI;
+            *foundValue = gcorr;
+            gcorr -= decrement;
+            decrement *= 2;
+        }
+        else
+        {
+            if (decrement == 2)
+                break;
+            gcorr -= decrement;
+            decrement = 2;
+        }
+    }
+    return prevRSSI;
+}
+
+/** @brief Reads all chip configuration and checks if it matches with local registers copy
+*/
+bool LMS7002M::IsSynced()
+{
+    if (controlPort->IsOpen() == false)
+        return false;
+    bool isSynced = true;
+    liblms7_status status;
+
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+
+    vector<uint16_t> addrToRead = mRegistersMap->GetUsedAddresses(0);
+    vector<uint16_t> dataReceived;
+    dataReceived.resize(addrToRead.size(), 0);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    status = SPI_read_batch(&addrToRead[0], &dataReceived[0], addrToRead.size());
+    if (status != LIBLMS7_SUCCESS)
+    {
+        isSynced = false;
+        goto isSyncedEnding;
+    }
+
+    //mask out readonly bits
+    for (uint16_t j = 0; j < sizeof(readOnlyRegisters) / sizeof(uint16_t); ++j)
+        for (uint16_t k = 0; k < addrToRead.size(); ++k)
+            if (readOnlyRegisters[j] == addrToRead[k])
+            {
+                dataReceived[k] &= readOnlyRegistersMasks[j];
+                break;
+            }
+
+    //check if local copy matches chip
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+    {
+        if (dataReceived[i] != mRegistersMap->GetValue(0, addrToRead[i]))
+        {
+            isSynced = false;
+            goto isSyncedEnding;
+        }
+    }
+
+    addrToRead.clear(); //add only B channel addresses
+    addrToRead = mRegistersMap->GetUsedAddresses(1);
+
+    //mask out readonly bits
+    for (uint16_t j = 0; j < sizeof(readOnlyRegisters) / sizeof(uint16_t); ++j)
+        for (uint16_t k = 0; k < addrToRead.size(); ++k)
+            if (readOnlyRegisters[j] == addrToRead[k])
+            {
+                dataReceived[k] &= readOnlyRegistersMasks[j];
+                break;
+            }
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    status = SPI_read_batch(&addrToRead[0], &dataReceived[0], addrToRead.size());
+    if (status != LIBLMS7_SUCCESS)
+        return false;
+    //check if local copy matches chip
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+        if (dataReceived[i] != mRegistersMap->GetValue(1, addrToRead[i]))
+        {
+            isSynced = false;
+            break;
+        }
+
+isSyncedEnding:
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //restore previously used channel
+    return isSynced;
+}
+
+/** @brief Writes all registers from host to chip
+
+When used on Novena board, also changes gpios to match rx path and tx band selections
+*/
+liblms7_status LMS7002M::UploadAll()
+{
+    if (controlPort == NULL)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC)); //remember used channel
+
+    liblms7_status status;
+
+    vector<uint16_t> addrToWrite;
+    vector<uint16_t> dataToWrite;
+
+    uint16_t x0020_value = mRegistersMap->GetValue(0, 0x0020);
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1); //select A channel
+
+    addrToWrite = mRegistersMap->GetUsedAddresses(0);
+    //remove 0x0020 register from list, to not change MAC
+    addrToWrite.erase( find(addrToWrite.begin(), addrToWrite.end(), 0x0020) );
+    for (auto address : addrToWrite)
+        dataToWrite.push_back(mRegistersMap->GetValue(0, address));
+
+    status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+    status = LIBLMS7_SUCCESS;
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    //after all channel A registers have been written, update 0x0020 register value
+    status = SPI_write(0x0020, x0020_value);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    addrToWrite = mRegistersMap->GetUsedAddresses(1);
+    dataToWrite.clear();
+   for (auto address : addrToWrite)
+    {
+        dataToWrite.push_back(mRegistersMap->GetValue(1, address));
+    }
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2); //select B channel
+    status = SPI_write_batch(&addrToWrite[0], &dataToWrite[0], addrToWrite.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //restore last used channel
+
+    //in case of Novena board, need to update GPIO
+    if(controlPort->GetInfo().device == LMS_DEV_NOVENA)
+    {
+        uint16_t regValue = SPI_read(0x0706) & 0xFFF8;
+        //lms_gpio2 - tx output selection:
+		//		0 - TX1_A and TX1_B (Band 1),
+		//		1 - TX2_A and TX2_B (Band 2)
+        regValue |= Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF)) << 2; //gpio2
+        //RX active paths
+        //lms_gpio0 | lms_gpio1      	RX_A		RX_B
+        //  0 			0       =>  	no active path
+        //  1   		0 		=>	LNAW_A  	LNAW_B
+        //  0			1		=>	LNAH_A  	LNAH_B
+        //  1			1		=>	LNAL_A 	 	LNAL_B
+        switch(Get_SPI_Reg_bits(LMS7param(SEL_PATH_RFE)))
+        {
+            //set gpio1:gpio0
+            case 0: regValue |= 0x0; break;
+            case 1: regValue |= 0x2; break;
+            case 2: regValue |= 0x3; break;
+            case 3: regValue |= 0x1; break;
+        }
+        SPI_write(0x0706, regValue);
+    }
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Reads all registers from the chip to host
+
+When used on Novena board, also updates gpios to match rx path and tx band selections
+*/
+liblms7_status LMS7002M::DownloadAll()
+{
+    if (controlPort == nullptr)
+        return LIBLMS7_NO_CONNECTION_MANAGER;
+    if (controlPort->IsOpen() == false)
+        return LIBLMS7_NOT_CONNECTED;
+    liblms7_status status;
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC), false);
+
+    vector<uint16_t> addrToRead = mRegistersMap->GetUsedAddresses(0);
+    vector<uint16_t> dataReceived;
+    dataReceived.resize(addrToRead.size(), 0);
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    status = SPI_read_batch(&addrToRead[0], &dataReceived[0], addrToRead.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+    {
+        uint16_t adr = addrToRead[i];
+        uint16_t val = dataReceived[i];
+        mRegistersMap->SetValue(0, addrToRead[i], dataReceived[i]);
+    }
+
+    addrToRead.clear(); //add only B channel addresses
+    addrToRead = mRegistersMap->GetUsedAddresses(1);
+    dataReceived.resize(addrToRead.size(), 0);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    status = SPI_read_batch(&addrToRead[0], &dataReceived[0], addrToRead.size());
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    for (uint16_t i = 0; i < addrToRead.size(); ++i)
+        mRegistersMap->SetValue(1, addrToRead[i], dataReceived[i]);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch); //retore previously used channel
+
+    //in case of Novena board, update GPIO
+    if(controlPort->GetInfo().device == LMS_DEV_NOVENA)
+    {
+        uint16_t regValue = SPI_read(0x0706) & 0xFFF8;
+        //lms_gpio2 - tx output selection:
+		//		0 - TX1_A and TX1_B (Band 1),
+		//		1 - TX2_A and TX2_B (Band 2)
+        regValue |= Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF)) << 2; //gpio2
+        //RX active paths
+        //lms_gpio0 | lms_gpio1      	RX_A		RX_B
+        //  0 			0       =>  	no active path
+        //  1   		0 		=>	LNAW_A  	LNAW_B
+        //  0			1		=>	LNAH_A  	LNAH_B
+        //  1			1		=>	LNAL_A 	 	LNAL_B
+        switch(Get_SPI_Reg_bits(LMS7param(SEL_PATH_RFE)))
+        {
+            //set gpio1:gpio0
+            case 0: regValue |= 0x0; break;
+            case 1: regValue |= 0x2; break;
+            case 2: regValue |= 0x3; break;
+            case 3: regValue |= 0x1; break;
+        }
+        SPI_write(0x0706, regValue);
+    }
+
+    return LIBLMS7_SUCCESS;
+}
+
+/** @brief Configures interfaces for desired frequency
+    Sets interpolation and decimation, changes MCLK sources and TSP clock dividers accordingly to selected interpolation and decimation
+*/
+liblms7_status LMS7002M::SetInterfaceFrequency(float_type cgen_freq_MHz, const uint8_t interpolation, const uint8_t decimation)
+{
+    Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), decimation);
+    Modify_SPI_Reg_bits(LMS7param(HBI_OVR_TXTSP), interpolation);
+    liblms7_status status = SetFrequencyCGEN(cgen_freq_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    if (decimation == 7 || decimation == 0) //bypass
+    {
+        Modify_SPI_Reg_bits(LMS7param(RXTSPCLKA_DIV), 0);
+        Modify_SPI_Reg_bits(LMS7param(RXDIVEN), false);
+        Modify_SPI_Reg_bits(LMS7param(MCLK2SRC), 3);
+    }
+    else
+    {
+        uint8_t divider = (uint8_t)pow(2.0, decimation);
+        if (divider > 1)
+            Modify_SPI_Reg_bits(LMS7param(RXTSPCLKA_DIV), (divider / 2) - 1);
+        else
+            Modify_SPI_Reg_bits(LMS7param(RXTSPCLKA_DIV), 0);
+        Modify_SPI_Reg_bits(LMS7param(RXDIVEN), true);
+        Modify_SPI_Reg_bits(LMS7param(MCLK2SRC), 1);
+    }
+    if (interpolation == 7 || interpolation == 0) //bypass
+    {
+        Modify_SPI_Reg_bits(LMS7param(TXTSPCLKA_DIV), 0);
+        Modify_SPI_Reg_bits(LMS7param(TXDIVEN), false);
+        Modify_SPI_Reg_bits(LMS7param(MCLK1SRC), 2);
+    }
+    else
+    {
+        uint8_t divider = (uint8_t)pow(2.0, interpolation);
+        if (divider > 1)
+            Modify_SPI_Reg_bits(LMS7param(TXTSPCLKA_DIV), (divider / 2) - 1);
+        else
+            Modify_SPI_Reg_bits(LMS7param(TXTSPCLKA_DIV), 0);
+        Modify_SPI_Reg_bits(LMS7param(TXDIVEN), true);
+        Modify_SPI_Reg_bits(LMS7param(MCLK1SRC), 0);
+    }
+    return status;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.h
new file mode 100644
index 0000000000000000000000000000000000000000..81234c28a3fa7686041eaed5efc5c518e8f745d5
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M.h
@@ -0,0 +1,177 @@
+/**
+@file	LMS7002M.h
+@author Lime Microsystems (www.limemicro.com)
+@brief	LMS7002M transceiver configuration interface
+*/
+
+#ifndef LMS7API_H
+#define LMS7API_H
+
+#include "LMS7002M_statuses.h"
+#include "LMS7002M_parameters.h"
+#include "typedefs.h"
+
+#include <sstream>
+
+class LMScomms;
+class LMS7002M_RegistersMap;
+
+class LMS7002M
+{
+public:
+    enum
+    {
+        Rx, Tx
+    };
+
+	LMS7002M();
+    LMS7002M(LMScomms* controlPort);
+	virtual ~LMS7002M();
+
+    ///@name Registers writing and reading
+    liblms7_status UploadAll();
+    liblms7_status DownloadAll();
+    bool IsSynced();
+
+	liblms7_status ResetChip();
+	liblms7_status LoadConfig(const char* filename);
+	liblms7_status SaveConfig(const char* filename);
+    ///@}
+
+    ///@name Registers writing and reading
+    uint16_t Get_SPI_Reg_bits(const LMS7Parameter &param, bool fromChip = true);
+    uint16_t Get_SPI_Reg_bits(uint16_t address, uint8_t msb, uint8_t lsb, bool fromChip = true);
+    liblms7_status Modify_SPI_Reg_bits(const LMS7Parameter &param, const uint16_t value, bool fromChip = true);
+    liblms7_status Modify_SPI_Reg_bits(uint16_t address, uint8_t msb, uint8_t lsb, uint16_t value, bool fromChip = true);
+    liblms7_status SPI_write(uint16_t address, uint16_t data);
+    uint16_t SPI_read(uint16_t address, bool fromChip = true, liblms7_status *status = 0);
+    liblms7_status RegistersTest();
+    ///@}
+
+    ///@name Transmitter, Receiver calibrations
+	liblms7_status CalibrateRx(float_type bandwidth_MHz);
+	liblms7_status CalibrateTx(float_type bandwidth_MHz);
+    ///@}
+
+    ///@name Filters tuning
+	enum TxFilter
+	{
+		TX_LADDER, TX_REALPOLE, TX_HIGHBAND
+	};
+    enum RxFilter
+    {
+        RX_TIA, RX_LPF_LOWBAND, RX_LPF_HIGHBAND
+    };
+	liblms7_status TuneTxFilter(TxFilter filterType, float_type bandwidth_MHz);
+	liblms7_status TuneTxFilterLowBandChain(float_type ladder_bw_MHz, float_type realpole_bw_MHz);
+	liblms7_status TuneRxFilter(RxFilter filterType, float_type bandwidth_MHz);
+    ///@}
+
+    ///@name CGEN and PLL
+	float_type GetReferenceClk_SX(bool tx);
+	float_type GetFrequencyCGEN_MHz();
+	liblms7_status SetFrequencyCGEN(float_type freq_MHz);
+	float_type GetFrequencySX_MHz(bool tx, float_type refClk_MHz);
+	liblms7_status SetFrequencySX(bool tx, float_type freq_MHz, float_type refClk_MHz);
+    ///VCO modules available for tuning
+    enum VCO_Module
+    {
+        VCO_CGEN, VCO_SXR, VCO_SXT
+    };
+    liblms7_status TuneVCO(VCO_Module module);
+    ///@}
+
+    ///@name TSP
+	liblms7_status LoadDC_REG_IQ(bool tx, int16_t I, int16_t Q);
+	liblms7_status SetNCOFrequency(bool tx, uint8_t index, float_type freq_MHz);
+	float_type GetNCOFrequency_MHz(bool tx, uint8_t index, float_type refClk_MHz, bool fromChip = true);
+    liblms7_status SetNCOPhaseOffsetForMode0(bool tx, float_type angle_Deg);
+	liblms7_status SetNCOPhaseOffset(bool tx, uint8_t index, float_type angle_Deg);
+	float_type GetNCOPhaseOffset_Deg(bool tx, uint8_t index);
+	liblms7_status SetGFIRCoefficients(bool tx, uint8_t GFIR_index, const int16_t *coef, uint8_t coefCount);
+	liblms7_status GetGFIRCoefficients(bool tx, uint8_t GFIR_index, int16_t *coef, uint8_t coefCount);
+    float_type GetReferenceClk_TSP_MHz(bool tx);
+    ///@}
+
+    liblms7_status SetInterfaceFrequency(float_type cgen_freq_MHz, const uint8_t interpolation, const uint8_t decimation);
+
+    ///enumeration to indicate module registers intervals
+    enum MemorySection
+    {
+        LimeLight = 0, EN_DIR, AFE, BIAS, XBUF, CGEN, LDO, BIST, CDS,
+        TRF, TBB, RFE, RBB, SX, TxTSP,
+        TxNCO, TxGFIR1, TxGFIR2, TxGFIR3a, TxGFIR3b, TxGFIR3c,
+        RxTSP, RxNCO, RxGFIR1, RxGFIR2, RxGFIR3a, RxGFIR3b, RxGFIR3c,
+        MEMORY_SECTIONS_COUNT
+    };
+    virtual liblms7_status SetDefaults(MemorySection module);
+	LMScomms* GetControlPort() const { return controlPort;};
+
+    static const float_type gLadder_lower_limit;
+    static const float_type gLadder_higher_limit;
+    static const float_type gRealpole_lower_limit;
+    static const float_type gRealpole_higher_limit;
+    static const float_type gHighband_lower_limit;
+    static const float_type  gHighband_higher_limit;
+
+    static const float_type gRxTIA_higher_limit;
+    static const float_type gRxTIA_lower_limit_g1;
+    static const float_type gRxTIA_lower_limit_g23;
+    static const float_type gRxLPF_low_lower_limit;
+    static const float_type gRxLPF_low_higher_limit;
+    static const float_type gRxLPF_high_lower_limit;
+    static const float_type gRxLPF_high_higher_limit;
+
+    static float_type gVCO_frequency_table[3][2];
+    static float_type gCGEN_VCO_frequencies[2];
+
+    //protected:
+    LMS7002M_RegistersMap *mRegistersMap;
+    static const uint16_t readOnlyRegisters[];
+    static const uint16_t readOnlyRegistersMasks[];
+
+    uint16_t MemorySectionAddresses[MEMORY_SECTIONS_COUNT][2];
+    ///@name Algorithms functions
+    void BackupAllRegisters();
+    void RestoreAllRegisters();
+    uint32_t GetRSSI();
+    void SetRxDCOFF(int8_t offsetI, int8_t offsetQ);
+    uint32_t FindMinRSSI_Gain(const LMS7Parameter &param, uint16_t *foundValue);
+    uint32_t FindMinRSSI(const LMS7Parameter &param, const int16_t startValue, int16_t *result, const uint8_t scanWidth, const uint8_t twoCompl, int8_t stepMult = 1);
+    uint32_t FindMinRSSI(const uint16_t addr, const uint8_t msb, const uint8_t lsb, const int16_t startValue, int16_t *result, const uint8_t scanWidth, const uint8_t twoCompl, int8_t stepMult = 1);
+    void CalibrateRxDC_RSSI();
+    liblms7_status CalibrateTxSetup(float_type bandwidth_MHz);
+    liblms7_status CalibrateRxSetup(float_type bandwidth_MHz);
+    liblms7_status FixRXSaturation();
+    void FilterTuning_AdjustGains();
+    liblms7_status TuneTxFilterSetup(TxFilter type, float_type cutoff_MHz);
+    liblms7_status TuneRxFilterSetup(RxFilter type, float_type cutoff_MHz);
+    liblms7_status RFE_TIA_Calibration(float_type TIA_freq_MHz);
+    liblms7_status RxLPFLow_Calibration(float_type RxLPFL_freq_MHz);
+    liblms7_status RxLPFHigh_Calibration(float_type RxLPFH_freq_MHz);
+
+    liblms7_status RegistersTestInterval(uint16_t startAddr, uint16_t endAddr, uint16_t pattern, std::stringstream &ss);
+    liblms7_status SPI_write_batch(const uint16_t* spiAddr, const uint16_t* spiData, uint16_t cnt);
+    liblms7_status SPI_read_batch(const uint16_t* spiAddr, uint16_t* spiData, uint16_t cnt);
+    liblms7_status Modify_SPI_Reg_mask(const uint16_t *addr, const uint16_t *masks, const uint16_t *values, uint8_t start, uint8_t stop);
+    ///@}
+    ///Reference clock used for Receiver frequency calculations
+    float_type mRefClkSXR_MHz;
+    ///Reference clock used for Transmitter frequency calculations
+    float_type mRefClkSXT_MHz;
+
+    enum LogType
+    {
+        LOG_INFO,
+        LOG_WARNING,
+        LOG_ERROR,
+        LOG_DATA
+    };
+    virtual void Log(const char* text, LogType type);
+
+    ///port used for communicating with LMS7002M
+    LMScomms* controlPort;
+
+    liblms7_status LoadConfigLegacyFile(const char* filename);
+};
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8c870ffcc0da6869ab73b8d6c734766554a5a65e
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.cpp
@@ -0,0 +1,68 @@
+#include "LMS7002M_RegistersMap.h"
+#include "LMS7002M_parameters.h"
+
+LMS7002M_RegistersMap::LMS7002M_RegistersMap()
+{
+
+}
+
+LMS7002M_RegistersMap::~LMS7002M_RegistersMap()
+{
+
+}
+
+uint16_t LMS7002M_RegistersMap::GetDefaultValue(uint16_t address) const
+{
+    std::map<uint16_t, Register>::const_iterator iter = mChannelA.find(address);
+    if( iter != mChannelA.end())
+        return iter->second.defaultValue;
+    else
+        return 0;
+}
+
+void LMS7002M_RegistersMap::InitializeDefaultValues(const std::vector<const LMS7Parameter*> parameterList)
+{
+    for(auto parameter : parameterList)
+    {
+        uint16_t regValue = mChannelA[parameter->address].defaultValue;
+        mChannelA[parameter->address].defaultValue = regValue | (parameter->defaultValue << parameter->lsb);
+        mChannelA[parameter->address].value = mChannelA[parameter->address].defaultValue;
+        if(parameter->address >= 0x0100)
+            mChannelB[parameter->address].value = mChannelA[parameter->address].value;
+    }
+}
+
+void LMS7002M_RegistersMap::SetValue(uint8_t channel, const uint16_t address, const uint16_t value)
+{
+    if(channel == 0)
+        mChannelA[address].value = value;
+    else if(channel == 1)
+        mChannelB[address].value = value;
+}
+
+uint16_t LMS7002M_RegistersMap::GetValue(uint8_t channel, uint16_t address) const
+{
+    const std::map<const uint16_t, Register> *regMap;
+    if(channel == 0)
+        regMap = &mChannelA;
+    else if(channel == 1)
+        regMap = &mChannelB;
+    std::map<const uint16_t, Register>::const_iterator iter;
+    iter = regMap->find(address);
+    if (iter != regMap->end())
+        return iter->second.value;
+    else
+        return 0;
+}
+
+std::vector<uint16_t> LMS7002M_RegistersMap::GetUsedAddresses(const uint8_t channel) const
+{
+    std::vector<uint16_t> addresses;
+    if(channel == 0)
+        for(auto iter : mChannelA)
+            addresses.push_back(iter.first);
+    else if(channel == 1)
+        for(auto iter : mChannelB)
+            addresses.push_back(iter.first);
+    return addresses;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.h
new file mode 100644
index 0000000000000000000000000000000000000000..5ccda752db36187ef2626f751df312af5d4f4663
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_RegistersMap.h
@@ -0,0 +1,35 @@
+#ifndef LMS7002M_REGISTERS_MAP_H
+#define LMS7002M_REGISTERS_MAP_H
+
+#include <vector>
+#include <map>
+#include <typedefs.h>
+
+struct LMS7Parameter;
+
+class LMS7002M_RegistersMap
+{
+public:
+    struct Register
+    {
+        uint16_t value;
+        uint16_t defaultValue;
+        uint16_t mask;
+    };
+
+    LMS7002M_RegistersMap();
+    ~LMS7002M_RegistersMap();
+
+    uint16_t GetValue(uint8_t channel, uint16_t address) const;
+    void SetValue(uint8_t channel, const uint16_t address, const uint16_t value);
+
+    void InitializeDefaultValues(const std::vector<const LMS7Parameter*> parameterList);
+    uint16_t GetDefaultValue(uint16_t address) const;
+    std::vector<uint16_t> GetUsedAddresses(const uint8_t channel) const;
+
+protected:
+    std::map<const uint16_t, Register> mChannelA;
+    std::map<const uint16_t, Register> mChannelB;
+};
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_filtersCalibration.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_filtersCalibration.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2f3d38c1b587ae0cad7f5134857af0ffc444bb54
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_filtersCalibration.cpp
@@ -0,0 +1,861 @@
+/**
+@file	LMS7002M_filtersCalibration.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief	Implementation of LMS7002M transceiver filters calibration algorithms
+*/
+
+#include "LMS7002M.h"
+#include <cmath>
+
+///define for parameter enumeration if prefix might be needed
+#define LMS7param(id) id
+
+const float_type LMS7002M::gLadder_lower_limit = 2;
+const float_type LMS7002M::gLadder_higher_limit = 16;
+const float_type LMS7002M::gRealpole_lower_limit = 0.8;
+const float_type LMS7002M::gRealpole_higher_limit = 3.2;
+const float_type LMS7002M::gHighband_lower_limit = 28;
+const float_type LMS7002M::gHighband_higher_limit = 70;
+
+const float_type LMS7002M::gRxTIA_higher_limit = 60;
+const float_type LMS7002M::gRxTIA_lower_limit_g1 = 1.5;
+const float_type LMS7002M::gRxTIA_lower_limit_g23 = 0.5;
+const float_type LMS7002M::gRxLPF_low_lower_limit = 1;
+const float_type LMS7002M::gRxLPF_low_higher_limit = 20;
+const float_type LMS7002M::gRxLPF_high_lower_limit = 20;
+const float_type LMS7002M::gRxLPF_high_higher_limit = 70;
+
+liblms7_status LMS7002M::TuneTxFilterSetup(LMS7002M::TxFilter type, float_type cutoff_MHz)
+{
+    Modify_SPI_Reg_bits(LMS7param(EN_G_RFE), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TRF), 0);
+
+    //RBB
+    SetDefaults(RBB);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFL_RBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(INPUT_CTL_PGA_RBB), 3);
+    Modify_SPI_Reg_bits(LMS7param(ICT_PGA_OUT_RBB), 20);
+    Modify_SPI_Reg_bits(LMS7param(ICT_PGA_IN_RBB), 20);
+    Modify_SPI_Reg_bits(LMS7param(C_CTL_PGA_RBB), 3);
+
+    //TBB
+    SetDefaults(TBB);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6);
+
+    //AFE
+    uint8_t isel_dac_afe = (uint8_t)Get_SPI_Reg_bits(0x0082, 15, 13);
+    SetDefaults(AFE);
+    if (Get_SPI_Reg_bits(LMS7param(MAC)) == 2)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_TX_AFE2), 0); //PD_RX_AFE2 0
+        Modify_SPI_Reg_bits(LMS7param(PD_RX_AFE2), 0); //PD_RX_AFE2 0
+    }
+    Modify_SPI_Reg_bits(0x0082, 15, 13, isel_dac_afe);
+
+    //BIAS
+    uint8_t rpcalib_bias = (uint8_t)Get_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS));
+    SetDefaults(BIAS);
+    Modify_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS), rpcalib_bias);
+
+    //XBUF
+    Modify_SPI_Reg_bits(LMS7param(PD_XBUF_RX), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_XBUF_TX), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_G_XBUF), 1);
+
+    //CGEN
+    SetDefaults(CGEN);
+
+    //txtsp
+    SetDefaults(TxTSP);
+    Modify_SPI_Reg_bits(LMS7param(TSGMODE_TXTSP), 1);
+    Modify_SPI_Reg_bits(LMS7param(INSEL_TXTSP), 1);
+    Modify_SPI_Reg_bits(0x0208, 6, 4, 7);
+    LoadDC_REG_IQ(Tx, (int16_t)0x7FFF, (int16_t)0x8000);
+    float_type txNCOfreq = 0.05;
+    SetNCOFrequency(Tx, 0, txNCOfreq);
+
+    //rxtsp
+    SetDefaults(RxTSP);    
+    SetNCOFrequency(Rx, 0, txNCOfreq - 1);
+
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1);
+    Modify_SPI_Reg_bits(0x040C, 6, 3, 0x07);
+
+    Modify_SPI_Reg_bits(LMS7param(AGC_AVG_RXTSP), 7);
+    Modify_SPI_Reg_bits(LMS7param(CMIX_GAIN_RXTSP), 1);
+
+    return LIBLMS7_SUCCESS;
+}
+
+
+liblms7_status LMS7002M::TuneTxFilter(LMS7002M::TxFilter type, float_type cutoff_MHz)
+{   
+    liblms7_status status;
+    float_type lowLimit = 0;
+    float_type highLimit = 1000;
+    uint32_t rssi = 0;
+    int8_t dir;
+    uint8_t ccal_lpflad_tbb;
+    uint32_t rssi_value_100k;
+    int16_t rcal;
+
+    float_type ncoFreq = 0.05;
+    float_type cgenFreq;
+    uint8_t loopb_tbb;
+    uint8_t cg_iamp_tbb = 1;
+    uint8_t bypladder_tbb;
+    uint8_t pd_lpfh_tbb;
+    uint8_t pd_lpflad_tbb;
+    uint8_t pd_lpfs5;
+    uint8_t en_g_tbb = 1;
+    uint8_t pd_iamp_tbb = 0;
+    uint8_t tstin_tbb = 0;
+
+    BackupAllRegisters();    
+    //float_type userCLKGENfreq = GetFrequencyCGEN_MHz();
+
+    status = TuneTxFilterSetup(type, cutoff_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        goto TxFilterTuneEnd;    
+    cgenFreq = cutoff_MHz * 20;
+    if (cgenFreq < 60)
+        cgenFreq = 60;
+    if (cgenFreq > 640)
+        cgenFreq = 640;
+    if (type == TX_LADDER)
+    {
+        loopb_tbb = 2;
+        bypladder_tbb = 0;
+        pd_lpfh_tbb = 1;
+        pd_lpflad_tbb = 0;
+        pd_lpfs5 = 1;
+        lowLimit = gLadder_lower_limit;
+        highLimit = gLadder_higher_limit;
+    }
+    else if (type == TX_REALPOLE)
+    {
+        loopb_tbb = 3;
+        bypladder_tbb = 1;
+        pd_lpfh_tbb = 1;
+        pd_lpflad_tbb = 1;
+        pd_lpfs5 = 0;
+        lowLimit = gRealpole_lower_limit;
+        highLimit = gRealpole_higher_limit;
+    }
+    else if (type == TX_HIGHBAND)
+    {
+        loopb_tbb = 3;
+        bypladder_tbb = 0;
+        pd_lpfh_tbb = 0;
+        pd_lpflad_tbb = 1;
+        pd_lpfs5 = 1;
+        lowLimit = gHighband_lower_limit;
+        highLimit = gHighband_higher_limit;
+    }
+    if (cutoff_MHz == cgenFreq / 16)
+        cgenFreq -= 10;
+
+    if (cutoff_MHz < lowLimit || cutoff_MHz > highLimit)
+    {
+        status = LIBLMS7_FREQUENCY_OUT_OF_RANGE;
+        goto TxFilterTuneEnd;
+    }
+
+    status = SetFrequencyCGEN(cgenFreq);
+    if (status != LIBLMS7_SUCCESS)
+        goto TxFilterTuneEnd;
+
+    Modify_SPI_Reg_bits(LMS7param(LOOPB_TBB), loopb_tbb);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), cg_iamp_tbb);
+    Modify_SPI_Reg_bits(LMS7param(BYPLADDER_TBB), bypladder_tbb);
+    Modify_SPI_Reg_bits(LMS7param(TSTIN_TBB), tstin_tbb);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFH_TBB), pd_lpfh_tbb);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFIAMP_TBB), pd_iamp_tbb);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFLAD_TBB), pd_lpflad_tbb);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFS5_TBB), pd_lpfs5);
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TBB), en_g_tbb);
+
+    //B
+    //LADDER coefficients
+    float_type p1, p2, p3, p4, p5;
+    switch (type)
+    {
+    case TX_LADDER:
+        p1 = 1.29858903647958E-16;
+        p2 = -0.000110746929967704;
+        p3 = 0.00277593485991029;
+        p4 = 21.0384293169607;
+        p5 = -48.4092606238297;
+        break;
+    case TX_REALPOLE:
+        p1 = 1.93821841029921E-15;
+        p2 = -0.0429694461214244;
+        p3 = 0.253501254059498;
+        p4 = 88.9545445989649;
+        p5 = -48.0847491316861;
+        break;
+    case TX_HIGHBAND:
+        p1 = 1.10383E-06;
+        p2 = -0.0002108;
+        p3 = 0.019049487;
+        p4 = 1.433174459;
+        p5 = -47.69507793;
+        break;
+    }
+    rcal = (int16_t)(pow(cutoff_MHz, 4)*p1 + pow(cutoff_MHz, 3)*p2 + pow(cutoff_MHz, 2)*p3 + cutoff_MHz * p4 + p5);
+    if (rcal < 0)
+        rcal = 0;
+    if (rcal > 255)
+        rcal = 255;
+
+    if (type == TX_REALPOLE)
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+    else if (type == TX_LADDER)
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFLAD_TBB), rcal);
+    else if (type == TX_HIGHBAND)
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFH_TBB), rcal);
+
+    FilterTuning_AdjustGains();
+
+    rssi_value_100k = (uint32_t)( GetRSSI()*0.707 );
+
+    SetNCOFrequency(Tx, 0, cutoff_MHz);
+    SetNCOFrequency(Rx, 0, cutoff_MHz - 1);
+
+    for (ccal_lpflad_tbb = 31; ccal_lpflad_tbb > 0; --ccal_lpflad_tbb)
+    {
+        Modify_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB), ccal_lpflad_tbb);
+        rssi = GetRSSI();
+        if (rssi > rssi_value_100k && ccal_lpflad_tbb == 31)
+            break; //skip this search, continue to advanced search
+        if (rssi > rssi_value_100k)
+        {
+            status = LIBLMS7_SUCCESS;
+            goto TxFilterTuneEnd; //found correct value
+        }
+    }
+
+
+    //advanced search for c and r values
+    status = LIBLMS7_FAILURE;
+    dir = ccal_lpflad_tbb == 31 ? -1 : 1;
+    while (rcal > 0 && rcal < 255)
+    {
+        rcal += 5 * dir;
+        if (rcal < 0 && rcal > 255)
+            break;
+        if (type == TX_REALPOLE)
+            Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+        else if (type == TX_LADDER)
+            Modify_SPI_Reg_bits(LMS7param(RCAL_LPFLAD_TBB), rcal);
+        else if (type == TX_HIGHBAND)
+            Modify_SPI_Reg_bits(LMS7param(RCAL_LPFH_TBB), rcal);
+        SetNCOFrequency(Tx, 0, ncoFreq);
+        SetNCOFrequency(Rx, 0, ncoFreq - 1);
+        Modify_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB), 16);
+        rssi_value_100k = GetRSSI();
+        SetNCOFrequency(Tx, 0, cutoff_MHz);
+        SetNCOFrequency(Rx, 0, cutoff_MHz - 1);
+        for (ccal_lpflad_tbb = 31; ccal_lpflad_tbb > 0; --ccal_lpflad_tbb)
+        {
+            Modify_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB), ccal_lpflad_tbb);
+            rssi = GetRSSI();
+            if (rssi > rssi_value_100k*0.707 && ccal_lpflad_tbb == 31)
+                break; //skip c search, need to change r value
+            if (rssi > rssi_value_100k*0.707)
+            {
+                status = LIBLMS7_SUCCESS;
+                goto TxFilterTuneEnd;
+            }
+        }
+    }
+
+    //end
+TxFilterTuneEnd:
+    RestoreAllRegisters();
+    if (status != LIBLMS7_SUCCESS)
+        return status;    
+    Modify_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB), ccal_lpflad_tbb);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6);
+
+    if (type == TX_REALPOLE)
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+    else if (type == TX_LADDER)
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFLAD_TBB), rcal);
+    else if (type == TX_HIGHBAND)
+    {
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFH_TBB), rcal);
+        Modify_SPI_Reg_bits(0x0105, 4, 0, 0x7); //set powerdowns
+    }
+    return LIBLMS7_SUCCESS;
+}
+
+void LMS7002M::FilterTuning_AdjustGains()
+{
+    uint8_t cg_iamp_tbb;
+    uint32_t rssi = 0;
+    const uint32_t rssi_required = 0x8400;
+    uint8_t g_pga_rbb = (uint8_t)Get_SPI_Reg_bits(LMS7param(G_PGA_RBB));
+
+    while (g_pga_rbb < 31)
+    {
+        cg_iamp_tbb = 0;
+        while (cg_iamp_tbb < 63 && rssi < rssi_required)
+        {
+            Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), cg_iamp_tbb);
+            rssi = GetRSSI();
+            if (rssi > rssi_required)
+                return;
+            ++cg_iamp_tbb;
+        }
+        g_pga_rbb += 6;
+        if (g_pga_rbb > 31)
+            g_pga_rbb = 31;
+        Modify_SPI_Reg_bits(LMS7param(G_PGA_RBB), g_pga_rbb);
+    }
+}
+
+liblms7_status LMS7002M::TuneTxFilterLowBandChain(float_type bandwidth, float_type realpole_MHz)
+{
+    uint32_t rssi;
+    uint32_t rssi_value_10k;
+    bool prevRSSIbigger;
+    int16_t rcal;
+    float_type p1,p2,p3,p4,p5;
+    float_type ncoFreq = 0.05;
+    float_type cgenFreq;
+    BackupAllRegisters();
+
+    liblms7_status status = TuneTxFilter(TX_LADDER, bandwidth);
+    uint8_t ladder_c_value = (uint8_t)Get_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB));
+    uint8_t ladder_r_value = (uint8_t)Get_SPI_Reg_bits(LMS7param(RCAL_LPFLAD_TBB));
+    status = TuneTxFilterSetup(TX_LADDER, bandwidth);
+
+    if (bandwidth < gLadder_lower_limit || bandwidth > gLadder_higher_limit)
+    {
+        status = LIBLMS7_FREQUENCY_OUT_OF_RANGE;
+        goto TxFilterLowBandChainEnd;
+    }
+
+    //realpole calibration
+    //float userCLKGENfreq = GetFrequencyCGEN();
+
+    cgenFreq = realpole_MHz * 20;
+    if (cgenFreq < 60)
+        cgenFreq = 60;
+    if (cgenFreq > 640)
+        cgenFreq = 640;
+
+    if (realpole_MHz < gRealpole_lower_limit || realpole_MHz > gRealpole_higher_limit)
+    {
+        status = LIBLMS7_FREQUENCY_OUT_OF_RANGE;
+        goto TxFilterLowBandChainEnd;
+    }
+
+    status = SetFrequencyCGEN(cgenFreq);
+    if (status != LIBLMS7_SUCCESS)
+        goto TxFilterLowBandChainEnd;
+
+    Modify_SPI_Reg_bits(LMS7param(LOOPB_TBB), 3);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(BYPLADDER_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(TSTIN_TBB), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFH_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFIAMP_TBB), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFLAD_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFS5_TBB), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TBB), 1);
+
+    //B
+    p1 = 1.93821841029921E-15;
+    p2 = -0.0429694461214244;
+    p3 = 0.253501254059498;
+    p4 = 88.9545445989649;
+    p5 = -48.0847491316861;
+    rcal = (int16_t)(pow(realpole_MHz, 4)*p1 + pow(realpole_MHz, 3)*p2 + pow(realpole_MHz, 2)*p3 + realpole_MHz * p4 + p5);
+    if (rcal < 0)
+        rcal = 0;
+    if (rcal > 255)
+        rcal = 255;
+    Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+
+    FilterTuning_AdjustGains();
+
+    rssi_value_10k = GetRSSI();
+    SetNCOFrequency(Tx, 0, realpole_MHz);
+    SetNCOFrequency(Rx, 0, realpole_MHz - 1);
+
+    prevRSSIbigger = GetRSSI() > rssi_value_10k*0.707;
+    status = LIBLMS7_FAILURE; //assuming r value is not found
+    while (rcal >= 0 && rcal < 256)
+    {
+        Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+        SetNCOFrequency(Tx, 0, ncoFreq);
+        SetNCOFrequency(Rx, 0, ncoFreq - 1);
+        rssi_value_10k = (uint32_t)( GetRSSI()*0.707 );
+
+        SetNCOFrequency(Tx, 0, realpole_MHz);
+        SetNCOFrequency(Rx, 0, realpole_MHz - 1);
+
+        rssi = GetRSSI();
+        if (rssi > rssi_value_10k)
+            --rcal;
+        else
+        {
+            if (prevRSSIbigger)
+            {
+                --rcal;
+                status = LIBLMS7_SUCCESS;
+                goto TxFilterLowBandChainEnd;
+            }
+            ++rcal;
+        }
+        prevRSSIbigger = rssi > rssi_value_10k;
+    }
+
+    //end
+TxFilterLowBandChainEnd:
+    RestoreAllRegisters();    
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    Modify_SPI_Reg_bits(LMS7param(CCAL_LPFLAD_TBB), ladder_c_value);
+    Modify_SPI_Reg_bits(LMS7param(RCAL_LPFLAD_TBB), ladder_r_value);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6);
+    Modify_SPI_Reg_bits(LMS7param(RCAL_LPFS5_TBB), rcal);
+    Modify_SPI_Reg_bits(0x0105, 4, 0, 0x11); //set powerdowns
+
+    return LIBLMS7_SUCCESS;
+}
+
+liblms7_status LMS7002M::TuneRxFilter(RxFilter filter, float_type bandwidth_MHz)
+{
+    liblms7_status status;
+    uint16_t cfb_tia_rfe;
+    uint16_t c_ctl_lpfl_rbb;
+    uint8_t ccomp_tia_rfe;
+    uint8_t rcomp_tia_rfe;
+    uint8_t c_ctl_lpfh_rbb;
+    uint8_t ict_pga_out;
+    uint8_t ict_pga_in;
+    uint8_t r_ctl_lpf_rbb;
+    uint8_t c_ctl_pga_rbb;
+    uint8_t rcc_ctl_lpfl_rbb;
+    uint8_t rcc_ctl_lpfh_rbb;
+    float_type lowerLimit;
+    float_type higherLimit;
+    if (filter == RX_TIA)
+    {
+        lowerLimit = Get_SPI_Reg_bits(LMS7param(G_TIA_RFE)) == 1 ? gRxTIA_lower_limit_g1 : gRxTIA_lower_limit_g23;
+        higherLimit = gRxTIA_higher_limit;
+    }
+    else if (filter == RX_LPF_LOWBAND)
+    {
+        lowerLimit = gRxLPF_low_lower_limit;
+        higherLimit = gRxLPF_low_higher_limit;
+    }
+    else if (filter == RX_LPF_HIGHBAND)
+    {
+        lowerLimit = gRxLPF_high_lower_limit;
+        higherLimit = gRxLPF_high_higher_limit;
+    }
+    if (bandwidth_MHz < lowerLimit || bandwidth_MHz > higherLimit)
+        return LIBLMS7_FREQUENCY_OUT_OF_RANGE;
+
+    BackupAllRegisters();
+
+    status = TuneRxFilterSetup(filter, bandwidth_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        goto RxFilterTuneEnd;
+
+    if (filter == RX_TIA)
+        status = RFE_TIA_Calibration(bandwidth_MHz);
+    else if (filter == RX_LPF_LOWBAND)
+        status = RxLPFLow_Calibration(bandwidth_MHz);
+    else if (filter == RX_LPF_HIGHBAND)
+        status = RxLPFHigh_Calibration(bandwidth_MHz);
+
+    cfb_tia_rfe = Get_SPI_Reg_bits(LMS7param(CFB_TIA_RFE));
+    c_ctl_lpfl_rbb = Get_SPI_Reg_bits(LMS7param(C_CTL_LPFL_RBB));
+    ccomp_tia_rfe = (int8_t)Get_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE));
+    rcomp_tia_rfe = (int8_t)Get_SPI_Reg_bits(LMS7param(RCOMP_TIA_RFE));
+    c_ctl_lpfh_rbb = (int8_t)Get_SPI_Reg_bits(LMS7param(C_CTL_LPFH_RBB));
+    ict_pga_out = (int8_t)Get_SPI_Reg_bits(LMS7param(ICT_PGA_OUT_RBB));
+    ict_pga_in = (int8_t)Get_SPI_Reg_bits(LMS7param(ICT_PGA_IN_RBB));
+    r_ctl_lpf_rbb = (int8_t)Get_SPI_Reg_bits(LMS7param(R_CTL_LPF_RBB));
+    c_ctl_pga_rbb = (int8_t)Get_SPI_Reg_bits(LMS7param(C_CTL_PGA_RBB));
+    rcc_ctl_lpfl_rbb = (int8_t)Get_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB));
+    rcc_ctl_lpfh_rbb = (int8_t)Get_SPI_Reg_bits(LMS7param(RCC_CTL_LPFH_RBB));
+
+RxFilterTuneEnd:
+    RestoreAllRegisters();
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    if (filter == RX_TIA)
+    {
+        Modify_SPI_Reg_bits(LMS7param(ICT_TIAMAIN_RFE), 2);
+        Modify_SPI_Reg_bits(LMS7param(ICT_TIAOUT_RFE), 2);
+        Modify_SPI_Reg_bits(LMS7param(RFB_TIA_RFE), 16);
+        Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), cfb_tia_rfe);
+        Modify_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE), ccomp_tia_rfe);
+        Modify_SPI_Reg_bits(LMS7param(RCOMP_TIA_RFE), rcomp_tia_rfe);
+        Modify_SPI_Reg_bits(0x010c, 1, 0, 0x1);
+    }
+    else if (filter == RX_LPF_LOWBAND)
+    {
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), rcc_ctl_lpfl_rbb);
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFL_RBB), c_ctl_lpfl_rbb);
+        Modify_SPI_Reg_bits(LMS7param(ICT_PGA_OUT_RBB), ict_pga_out);
+        Modify_SPI_Reg_bits(LMS7param(ICT_PGA_IN_RBB), ict_pga_in);
+        Modify_SPI_Reg_bits(LMS7param(R_CTL_LPF_RBB), r_ctl_lpf_rbb);
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_PGA_RBB), c_ctl_pga_rbb);
+        Modify_SPI_Reg_bits(0x0115, 3, 0, 0x9);
+        Modify_SPI_Reg_bits(0x0118, 15, 13, 0x1);
+    }
+    else if (filter == RX_LPF_HIGHBAND)
+    {
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFH_RBB), rcc_ctl_lpfh_rbb);
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFH_RBB), c_ctl_lpfh_rbb);
+        Modify_SPI_Reg_bits(LMS7param(ICT_PGA_OUT_RBB), ict_pga_out);
+        Modify_SPI_Reg_bits(LMS7param(ICT_PGA_IN_RBB), ict_pga_in);
+        Modify_SPI_Reg_bits(LMS7param(R_CTL_LPF_RBB), r_ctl_lpf_rbb);
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_PGA_RBB), c_ctl_pga_rbb);
+        Modify_SPI_Reg_bits(0x0115, 3, 0, 0x5);
+        Modify_SPI_Reg_bits(0x0118, 15, 13, 0x0);
+    }
+    return LIBLMS7_SUCCESS;
+}
+
+liblms7_status LMS7002M::TuneRxFilterSetup(RxFilter type, float_type cutoff_MHz)
+{
+    liblms7_status status;
+    uint8_t ch = (uint8_t)Get_SPI_Reg_bits(LMS7param(MAC));
+
+    //RFE
+    uint8_t g_tia_rfe = (uint8_t)Get_SPI_Reg_bits(LMS7param(G_TIA_RFE));
+    SetDefaults(RFE);
+    Modify_SPI_Reg_bits(LMS7param(SEL_PATH_RFE), 2);
+
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTRX_RFE), 1);
+    else
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTRX_RFE), 0);
+
+    Modify_SPI_Reg_bits(LMS7param(G_RXLOOPB_RFE), 8);
+    Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_2_RFE), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB2_RFE), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_MXLOBUF_RFE), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_QGEN_RFE), 0);
+    Modify_SPI_Reg_bits(LMS7param(ICT_TIAMAIN_RFE), 2);
+    Modify_SPI_Reg_bits(LMS7param(ICT_TIAOUT_RFE), 2);
+    Modify_SPI_Reg_bits(LMS7param(RFB_TIA_RFE), 16);
+    Modify_SPI_Reg_bits(LMS7param(G_TIA_RFE), g_tia_rfe);
+
+    //RBB
+    SetDefaults(RBB);
+    Modify_SPI_Reg_bits(LMS7param(ICT_PGA_OUT_RBB), 20);
+    Modify_SPI_Reg_bits(LMS7param(ICT_PGA_IN_RBB), 20);
+    Modify_SPI_Reg_bits(LMS7param(C_CTL_PGA_RBB), 3);
+
+    //TRF
+    SetDefaults(TRF);
+    Modify_SPI_Reg_bits(LMS7param(L_LOOPB_TXPAD_TRF), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_LOOPB_TXPAD_TRF), 1);
+    if (ch == 2)
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTTX_TRF), 1);
+    else
+        Modify_SPI_Reg_bits(LMS7param(EN_NEXTTX_TRF), 0);
+    Modify_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF), 0);
+    Modify_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF), 1);
+
+    //TBB
+    SetDefaults(TBB);
+    Modify_SPI_Reg_bits(LMS7param(CG_IAMP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_FRP_TBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(ICT_IAMP_GG_FRP_TBB), 6);
+
+    //AFE
+    SetDefaults(AFE);
+    if (ch == 2)
+    {
+        Modify_SPI_Reg_bits(LMS7param(PD_TX_AFE2), 0);
+        Modify_SPI_Reg_bits(LMS7param(PD_RX_AFE2), 0);
+    }
+    //BIAS
+    uint8_t rp_calib_bias = (uint8_t)Get_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS));
+    SetDefaults(BIAS);
+    Modify_SPI_Reg_bits(LMS7param(RP_CALIB_BIAS), rp_calib_bias);
+
+    //XBUF
+    Modify_SPI_Reg_bits(LMS7param(PD_XBUF_RX), 0);
+    Modify_SPI_Reg_bits(LMS7param(PD_XBUF_TX), 0);
+    Modify_SPI_Reg_bits(LMS7param(EN_G_TRF), 1);
+
+    //CLKGEN
+    SetDefaults(CGEN);
+
+    //SXR
+    Modify_SPI_Reg_bits(LMS7param(MAC), 1);
+    SetDefaults(SX);
+    status = SetFrequencySX(Rx, 499.95, mRefClkSXR_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    Modify_SPI_Reg_bits(LMS7param(PD_VCO), 0);
+
+    //SXT
+    Modify_SPI_Reg_bits(LMS7param(MAC), 2);
+    SetDefaults(SX);
+    status = SetFrequencySX(Tx, 500, mRefClkSXT_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    Modify_SPI_Reg_bits(LMS7param(PD_VCO), 0);
+
+    Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+    //TxTSP
+    SetDefaults(TxTSP);
+    Modify_SPI_Reg_bits(LMS7param(TSGMODE_TXTSP), 1);
+    Modify_SPI_Reg_bits(LMS7param(INSEL_TXTSP), 1);
+    Modify_SPI_Reg_bits(0x0208, 8, 8, 1);
+    Modify_SPI_Reg_bits(0x0208, 6, 4, 0x7);
+    LoadDC_REG_IQ(Tx, (int16_t)0x7FFF, (int16_t)0x8000);
+    SetNCOFrequency(Tx, 0, 0);
+
+    //RxTSP
+    SetDefaults(RxTSP);
+    Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1);
+    Modify_SPI_Reg_bits(0x040C, 5, 3, 0x7);
+    Modify_SPI_Reg_bits(LMS7param(AGC_AVG_RXTSP), 7);
+    Modify_SPI_Reg_bits(LMS7param(CMIX_GAIN_RXTSP), 1);
+
+    float_type sxtfreq = GetFrequencySX_MHz(Tx, mRefClkSXT_MHz);
+    float_type sxrfreq = GetFrequencySX_MHz(Rx, mRefClkSXR_MHz);
+    SetNCOFrequency(Rx, 0, sxtfreq - sxrfreq - 1);
+    return LIBLMS7_SUCCESS;
+}
+
+liblms7_status LMS7002M::RFE_TIA_Calibration(float_type TIA_freq_MHz)
+{
+    liblms7_status status;
+    bool prevRSSIbigger;
+    uint8_t ccomp_tia_rfe_value;
+    int16_t rcomp_tia_rfe;
+    float_type cgenFreq = TIA_freq_MHz * 20;
+    uint32_t rssi;
+    uint32_t rssi_value_50k;
+    //RFE
+    uint8_t g_tia_rfe = (uint8_t)Get_SPI_Reg_bits(LMS7param(G_TIA_RFE));
+    int16_t cfb_tia_rfe_value;
+    if (g_tia_rfe == 1)
+        cfb_tia_rfe_value = (uint16_t)(5400 / TIA_freq_MHz - 15);
+    else if (g_tia_rfe > 1)
+        cfb_tia_rfe_value = (uint16_t)(1680 / TIA_freq_MHz - 10);
+    else
+        return LIBLMS7_FAILURE;
+    Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), cfb_tia_rfe_value);
+
+    if (g_tia_rfe == 1)
+        ccomp_tia_rfe_value = (uint8_t)(cfb_tia_rfe_value / 100 + 1);
+    else if (g_tia_rfe > 1)
+        ccomp_tia_rfe_value = (uint8_t)(cfb_tia_rfe_value / 100);
+    else
+        return LIBLMS7_FAILURE;
+    if (ccomp_tia_rfe_value > 15)
+        ccomp_tia_rfe_value = 15;
+
+    Modify_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE), ccomp_tia_rfe_value);
+
+    rcomp_tia_rfe = (int16_t)(15 - cfb_tia_rfe_value * 2 / 100);
+    if (rcomp_tia_rfe < 0)
+        rcomp_tia_rfe = 0;
+    Modify_SPI_Reg_bits(LMS7param(RCOMP_TIA_RFE), rcomp_tia_rfe);
+
+    //RBB
+    Modify_SPI_Reg_bits(LMS7param(INPUT_CTL_PGA_RBB), 2);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFL_RBB), 1);
+
+    //CLKGEN
+    if (cgenFreq < 60)
+        cgenFreq = 60;
+    if (cgenFreq > 640)
+        cgenFreq = 640;
+
+    if (cgenFreq / 16 == TIA_freq_MHz)
+        status = SetFrequencyCGEN(cgenFreq - 10);
+    else
+        status = SetFrequencyCGEN(cgenFreq);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    FilterTuning_AdjustGains();
+
+    rssi_value_50k = (uint32_t)( GetRSSI() * 0.707 );
+    status = SetFrequencySX(Rx, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - TIA_freq_MHz, mRefClkSXR_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    SetNCOFrequency(Rx, 0, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - GetFrequencySX_MHz(Rx, mRefClkSXR_MHz) - 1);
+
+    prevRSSIbigger = GetRSSI() > rssi_value_50k;
+    while (cfb_tia_rfe_value >= 0 && cfb_tia_rfe_value < 4096)
+    {
+        Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), cfb_tia_rfe_value);
+        rssi = GetRSSI();
+        if (rssi > rssi_value_50k)
+            ++cfb_tia_rfe_value;
+        else
+        {
+            --cfb_tia_rfe_value;
+            if (prevRSSIbigger)
+                return LIBLMS7_SUCCESS; //found correct value
+        }
+        prevRSSIbigger = rssi > rssi_value_50k;
+    }
+    return LIBLMS7_FAILURE;
+}
+
+liblms7_status LMS7002M::RxLPFLow_Calibration(float_type RxLPFL_freq_MHz)
+{
+    liblms7_status status;
+    uint32_t rssi;
+    uint32_t rssi_value_50k;
+    int32_t c_ctl_lpfl_rbb;
+    bool prevRSSIbigger;
+    float_type cgenFreq_MHz = RxLPFL_freq_MHz * 20;
+    //RFE
+    Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), 15);
+    Modify_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE), 1);
+    Modify_SPI_Reg_bits(LMS7param(RCOMP_TIA_RFE), 15);
+    Modify_SPI_Reg_bits(LMS7param(G_TIA_RFE), 1);
+
+    //RBB
+    c_ctl_lpfl_rbb = (int32_t)(2160 / RxLPFL_freq_MHz - 103);
+    if (c_ctl_lpfl_rbb < 0)
+        c_ctl_lpfl_rbb = 0;
+    if (c_ctl_lpfl_rbb > 2047)
+        c_ctl_lpfl_rbb = 2047;
+    Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFL_RBB), c_ctl_lpfl_rbb);
+
+    if (RxLPFL_freq_MHz >= 15)
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 5);
+    else if (RxLPFL_freq_MHz >= 10)
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 4);
+    else if (RxLPFL_freq_MHz >= 5)
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 3);
+    else if (RxLPFL_freq_MHz >= 3)
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 2);
+    else if (RxLPFL_freq_MHz >= 1.4)
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 1);
+    else
+        Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFL_RBB), 0);
+
+    //CLKGEN
+    if (cgenFreq_MHz < 60)
+        cgenFreq_MHz = 60;
+    if (cgenFreq_MHz > 640)
+        cgenFreq_MHz = 640;
+    if (cgenFreq_MHz / 16 == RxLPFL_freq_MHz)
+        status = SetFrequencyCGEN(cgenFreq_MHz - 10);
+    else
+        status = SetFrequencyCGEN(cgenFreq_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    FilterTuning_AdjustGains();
+
+    rssi_value_50k = (uint32_t)( GetRSSI() * 0.707 );
+    status = SetFrequencySX(Rx, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - RxLPFL_freq_MHz, mRefClkSXR_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    SetNCOFrequency(Rx, 0, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - GetFrequencySX_MHz(Rx, mRefClkSXR_MHz) - 1);
+
+    prevRSSIbigger = GetRSSI() > rssi_value_50k;
+    while (c_ctl_lpfl_rbb >= 0 && c_ctl_lpfl_rbb < 2048)
+    {
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFL_RBB), c_ctl_lpfl_rbb);
+        rssi = GetRSSI();
+        if (rssi > rssi_value_50k)
+            ++c_ctl_lpfl_rbb;
+        else
+        {
+            --c_ctl_lpfl_rbb;
+            if (prevRSSIbigger)
+                return LIBLMS7_SUCCESS; //found correct value
+        }
+        prevRSSIbigger = rssi > rssi_value_50k;
+    }
+    return LIBLMS7_FAILURE;
+}
+
+liblms7_status LMS7002M::RxLPFHigh_Calibration(float_type RxLPFH_freq_MHz)
+{
+    liblms7_status status;
+    int16_t c_ctl_lpfh_rbb;
+    int16_t rcc_ctl_lpfh_rbb;
+    float_type cgenFreq = RxLPFH_freq_MHz * 20;
+    uint32_t rssi;
+    uint32_t rssi_value_50k;
+    bool prevRSSIbigger;
+    //RFE
+    Modify_SPI_Reg_bits(LMS7param(CFB_TIA_RFE), 15);
+    Modify_SPI_Reg_bits(LMS7param(CCOMP_TIA_RFE), 1);
+    Modify_SPI_Reg_bits(LMS7param(RCOMP_TIA_RFE), 15);
+    Modify_SPI_Reg_bits(LMS7param(G_TIA_RFE), 1);
+
+    //RBB
+    c_ctl_lpfh_rbb = (int16_t)(6000 / RxLPFH_freq_MHz - 50);
+    if (c_ctl_lpfh_rbb < 0)
+        c_ctl_lpfh_rbb = 0;
+    if (c_ctl_lpfh_rbb > 255)
+        c_ctl_lpfh_rbb = 255;
+    Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFH_RBB), c_ctl_lpfh_rbb);
+
+    rcc_ctl_lpfh_rbb = (int16_t)(RxLPFH_freq_MHz / 10 - 3);
+    if (rcc_ctl_lpfh_rbb < 0)
+        rcc_ctl_lpfh_rbb = 0;
+    Modify_SPI_Reg_bits(LMS7param(RCC_CTL_LPFH_RBB), rcc_ctl_lpfh_rbb);
+
+    Modify_SPI_Reg_bits(LMS7param(INPUT_CTL_PGA_RBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFL_RBB), 1);
+    Modify_SPI_Reg_bits(LMS7param(PD_LPFH_RBB), 0);
+
+    //CLKGEN
+    if (cgenFreq < 60)
+        cgenFreq = 60;
+    if (cgenFreq > 640)
+        cgenFreq = 640;
+    if (cgenFreq / 16 == RxLPFH_freq_MHz)
+        status = SetFrequencyCGEN(cgenFreq - 10);
+    else
+        status = SetFrequencyCGEN(cgenFreq);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+
+    FilterTuning_AdjustGains();
+
+    rssi_value_50k = (uint32_t)( GetRSSI() * 0.707);
+    status = SetFrequencySX(Rx, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - RxLPFH_freq_MHz, mRefClkSXR_MHz);
+    if (status != LIBLMS7_SUCCESS)
+        return status;
+    SetNCOFrequency(Rx, 0, GetFrequencySX_MHz(Tx, mRefClkSXT_MHz) - GetFrequencySX_MHz(Rx, mRefClkSXR_MHz) - 1);
+
+    prevRSSIbigger = GetRSSI() > rssi_value_50k;
+    while (c_ctl_lpfh_rbb >= 0 && c_ctl_lpfh_rbb < 256)
+    {
+        Modify_SPI_Reg_bits(LMS7param(C_CTL_LPFH_RBB), c_ctl_lpfh_rbb);
+        rssi = GetRSSI();
+        if (rssi > rssi_value_50k)
+            ++c_ctl_lpfh_rbb;
+        else
+        {
+            --c_ctl_lpfh_rbb;
+            if (prevRSSIbigger)
+                return LIBLMS7_SUCCESS; //found correct value
+        }
+        prevRSSIbigger = rssi > rssi_value_50k;
+    }
+    return LIBLMS7_FAILURE;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b28887d776de04f458c823529a6697ebb425fc32
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.cpp
@@ -0,0 +1,601 @@
+/**
+@file	LMS7002M_parameters.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief 	Definition of LMS7002M transceiver control parameters registers
+*/
+
+#include "LMS7002M_parameters.h"
+
+std::vector<const LMS7Parameter*> LMS7parameterList;
+
+const struct LMS7Parameter LRST_TX_B = { 0x0020, 15, 15, 1, "LRST_TX_B", "Resets all the logic registers to the default state for Tx MIMO channel B" };
+const struct LMS7Parameter MRST_TX_B = { 0x0020, 14, 14, 1, "MRST_TX_B", "Resets all the configuration memory to the default state for Tx MIMO channel B" };
+const struct LMS7Parameter LRST_TX_A = { 0x0020, 13, 13, 1, "LRST_TX_A", "Resets all the logic registers to the default state for Tx MIMO channel A" };
+const struct LMS7Parameter MRST_TX_A = { 0x0020, 12, 12, 1, "MRST_TX_A", "Resets all the configuration memory to the default state for Tx MIMO channel A" };
+const struct LMS7Parameter LRST_RX_B = { 0x0020, 11, 11, 1, "LRST_RX_B", "Resets all the logic registers to the default state for Rx MIMO channel B" };
+const struct LMS7Parameter MRST_RX_B = { 0x0020, 10, 10, 1, "MRST_RX_B", "Resets all the configuration memory to the default state for Rx MIMO channel B" };
+const struct LMS7Parameter LRST_RX_A = { 0x0020, 9, 9, 1, "LRST_RX_A", "Resets all the logic registers to the default state for Rx MIMO channel A" };
+const struct LMS7Parameter MRST_RX_A = { 0x0020, 8, 8, 1, "MRST_RX_A", "Resets all the configuration memory to the default state for Rx MIMO channel A" };
+const struct LMS7Parameter SRST_RXFIFO = { 0x0020, 7, 7, 1, "SRST_RXFIFO", "RX FIFO soft reset (LimeLight Interface)" };
+const struct LMS7Parameter SRST_TXFIFO = { 0x0020, 6, 6, 1, "SRST_TXFIFO", "TX FIFO soft reset (LimeLight Interface)" };
+const struct LMS7Parameter RXEN_B = { 0x0020, 5, 5, 1, "RXEN_B", "Power control for Rx MIMO channel B" };
+const struct LMS7Parameter RXEN_A = { 0x0020, 4, 4, 1, "RXEN_A", "Power control for Rx MIMO channel A" };
+const struct LMS7Parameter TXEN_B = { 0x0020, 3, 3, 1, "TXEN_B", "Power control for Tx MIMO channel B" };
+const struct LMS7Parameter TXEN_A = { 0x0020, 2, 2, 1, "TXEN_A", "Power control for Tx MIMO channel A" };
+const struct LMS7Parameter MAC = { 0x0020, 1, 0, 3, "MAC", "Selects MIMO channel for communication" };
+const struct LMS7Parameter TX_CLK_PE = { 0x0021, 11, 11, 1, "TX_CLK_PE", "Pull up control of TX_CLK pad" };
+const struct LMS7Parameter RX_CLK_PE = { 0x0021, 10, 10, 1, "RX_CLK_PE", "Pull up control of RX_CLK pad" };
+const struct LMS7Parameter SDA_PE = { 0x0021, 9, 9, 1, "SDA_PE", "Pull up control of SDA pad" };
+const struct LMS7Parameter SDA_DS = { 0x0021, 8, 8, 0, "SDA_DS", "Driver strength of SDA pad" };
+const struct LMS7Parameter SCL_PE = { 0x0021, 7, 7, 1, "SCL_PE", "Pull up control of SCL pad" };
+const struct LMS7Parameter SCL_DS = { 0x0021, 6, 6, 0, "SCL_DS", "Driver strength of SCL pad" };
+const struct LMS7Parameter SDIO_DS = { 0x0021, 5, 5, 0, "SDIO_DS", "Driver strength of SDIO pad" };
+const struct LMS7Parameter SDIO_PE = { 0x0021, 4, 4, 1, "SDIO_PE", "Pull up control of SDIO pad" };
+const struct LMS7Parameter SDO_PE = { 0x0021, 3, 3, 1, "SDO_PE", "Pull up control of SDO pad" };
+const struct LMS7Parameter SCLK_PE = { 0x0021, 2, 2, 1, "SCLK_PE", "Pull up control of SCLK pad" };
+const struct LMS7Parameter SEN_PE = { 0x0021, 1, 1, 1, "SEN_PE", "Pull up control of SEN pad" };
+const struct LMS7Parameter SPIMODE = { 0x0021, 0, 0, 1, "SPIMODE", "SPI communication mode" };
+const struct LMS7Parameter DIQ2_DS = { 0x0022, 11, 11, 0, "DIQ2_DS", "Driver strength of DIQ2 pad" };
+const struct LMS7Parameter DIQ2_PE = { 0x0022, 10, 10, 1, "DIQ2_PE", "Pull up control of DIQ2 pad" };
+const struct LMS7Parameter IQ_SEL_EN_2_PE = { 0x0022, 9, 9, 1, "IQ_SEL_EN_2_PE", "Pull up control of IQ_SEL_EN_2 pad" };
+const struct LMS7Parameter TXNRX2_PE = { 0x0022, 8, 8, 1, "TXNRX2_PE", "Pull up control of TXNRX2 pad" };
+const struct LMS7Parameter FCLK2_PE = { 0x0022, 7, 7, 1, "FCLK2_PE", "Pull up control of FCLK2 pad" };
+const struct LMS7Parameter MCLK2_PE = { 0x0022, 6, 6, 1, "MCLK2_PE", "Pull up control of MCLK2 pad" };
+const struct LMS7Parameter DIQ1_DS = { 0x0022, 5, 5, 0, "DIQ1_DS", "Pull up control of MCLK2 pad" };
+const struct LMS7Parameter DIQ1_PE = { 0x0022, 4, 4, 1, "DIQ1_PE", "Pull up control of DIQ1 pad" };
+const struct LMS7Parameter IQ_SEL_EN_1_PE = { 0x0022, 3, 3, 1, "IQ_SEL_EN_1_PE", "Pull up control of IQ_SEL_EN_1 pad" };
+const struct LMS7Parameter TXNRX1_PE = { 0x0022, 2, 2, 1, "TXNRX1_PE", "Pull up control of TXNRX1 pad" };
+const struct LMS7Parameter FCLK1_PE = { 0x0022, 1, 1, 1, "FCLK1_PE", "Pull up control of FCLK1 pad" };
+const struct LMS7Parameter MCLK1_PE = { 0x0022, 0, 0, 1, "MCLK1_PE", "Pull up control of MCLK1 pad" };
+const struct LMS7Parameter DIQDIRCTR2 = { 0x0023, 15, 15, 0, "DIQDIRCTR2", "DIQ2 direction control mode" };
+const struct LMS7Parameter DIQDIR2 = { 0x0023, 14, 14, 1, "DIQDIR2", "DIQ2 direction" };
+const struct LMS7Parameter DIQDIRCTR1 = { 0x0023, 13, 13, 0, "DIQDIRCTR1", "DIQ1 direction control mode" };
+const struct LMS7Parameter DIQDIR1 = { 0x0023, 12, 12, 1, "DIQDIR1", "DIQ1 direction" };
+const struct LMS7Parameter ENABLEDIRCTR2 = { 0x0023, 11, 11, 0, "ENABLEDIRCTR2", "ENABLE2 direction control mode" };
+const struct LMS7Parameter ENABLEDIR2 = { 0x0023, 10, 10, 1, "ENABLEDIR2", "ENABLE2 direction" };
+const struct LMS7Parameter ENABLEDIRCTR1 = { 0x0023, 9, 9, 0, "ENABLEDIRCTR1", "ENABLE1 direction control mode" };
+const struct LMS7Parameter ENABLEDIR1 = { 0x0023, 8, 8, 1, "ENABLEDIR1", "ENABLE1 direction." };
+const struct LMS7Parameter MOD_EN = { 0x0023, 6, 6, 1, "MOD_EN", "LimeLight interface enable" };
+const struct LMS7Parameter LML2_FIDM = { 0x0023, 5, 5, 0, "LML2_FIDM", "Frame start ID selection for Port 2 when LML_MODE2 = 0" };
+const struct LMS7Parameter LML2_TXNRXIQ = { 0x0023, 4, 4, 1, "LML2_TXNRXIQ", "TXIQ/RXIQ mode selection for Port 2 when LML_MODE2 = 0" };
+const struct LMS7Parameter LML2_MODE = { 0x0023, 3, 3, 1, "LML2_MODE", "Mode of LimeLight Port 2" };
+const struct LMS7Parameter LML1_FIDM = { 0x0023, 2, 2, 0, "LML1_FIDM", "Frame start ID selection for Port 1 when LML_MODE1 = 0" };
+const struct LMS7Parameter LML1_TXNRXIQ = { 0x0023, 1, 1, 0, "LML1_TXNRXIQ", "TXIQ/RXIQ mode selection for Port 1 when LML_MODE1 = 0" };
+const struct LMS7Parameter LML1_MODE = { 0x0023, 0, 0, 1, "LML1_MODE", "Mode of LimeLight Port 1" };
+const struct LMS7Parameter LML1_S3S = { 0x0024, 15, 14, 3, "LML1_S3S", "Sample source in position 3, when Port 1 is RF2BB" };
+const struct LMS7Parameter LML1_S2S = { 0x0024, 13, 12, 2, "LML1_S2S", "Sample source in position 2, when Port 1 is RF2BB" };
+const struct LMS7Parameter LML1_S1S = { 0x0024, 11, 10, 1, "LML1_S1S", "Sample source in position 1, when Port 1 is RF2BB" };
+const struct LMS7Parameter LML1_S0S = { 0x0024, 9, 8, 0, "LML1_S0S", "Sample source in position 0, when Port 1 is RF2BB" };
+const struct LMS7Parameter LML1_BQP = { 0x0024, 7, 6, 3, "LML1_BQP", "BQ sample position in frame, when Port 1 is BB2RF" };
+const struct LMS7Parameter LML1_BIP = { 0x0024, 5, 4, 2, "LML1_BIP", "BI sample position in frame, when Port 1 is BB2RF" };
+const struct LMS7Parameter LML1_AQP = { 0x0024, 3, 2, 1, "LML1_AQP", "AQ sample position in frame, when Port 1 is BB2RF" };
+const struct LMS7Parameter LML1_AIP = { 0x0024, 1, 0, 0, "LML1_AIP", "AI sample position in frame, when Port 1 is BB2RF" };
+const struct LMS7Parameter LML1_BB2RF_PST = { 0x0025, 15, 8, 1, "LML1_BB2RF_PST", "Number of clock cycles to wait before data drive stop after burst stop is detected in JESD207 mode on Port 1 and Port 1 BB2RF" };
+const struct LMS7Parameter LML1_BB2RF_PRE = { 0x0025, 7, 0, 1, "LML1_BB2RF_PRE", "Number of clock cycles to wait before data drive start after burst start is detected in JESD207 mode on Port 1 and Port 1 BB2RF" };
+const struct LMS7Parameter LML1_RF2BB_PST = { 0x0026, 15, 8, 1, "LML1_RF2BB_PST", "Number of clock cycles to wait before data capture stop after burst stop is detected in JESD207 mode on Port 1 and Port 1 is RF2BB" };
+const struct LMS7Parameter LML1_RF2BB_PRE = { 0x0026, 7, 0, 1, "LML1_RF2BB_PRE", "Number of clock cycles to wait before data capture start after burst start is detected in JESD207 mode on Port 1 and Port 1 RF2BB" };
+const struct LMS7Parameter LML2_S3S = { 0x0027, 15, 14, 3, "LML2_S3S", "Sample source in position 3, when Port 2 is RF2BB" };
+const struct LMS7Parameter LML2_S2S = { 0x0027, 13, 12, 2, "LML2_S2S", "Sample source in position 2, when Port 2 is RF2BB" };
+const struct LMS7Parameter LML2_S1S = { 0x0027, 11, 10, 1, "LML2_S1S", "Sample source in position 1, when Port 2 is RF2BB" };
+const struct LMS7Parameter LML2_S0S = { 0x0027, 9, 8, 0, "LML2_S0S", "Sample source in position 0, when Port 2 is RF2BB" };
+const struct LMS7Parameter LML2_BQP = { 0x0027, 7, 6, 3, "LML2_BQP", "BQ sample position in frame, when Port 2 is BB2RF" };
+const struct LMS7Parameter LML2_BIP = { 0x0027, 5, 4, 2, "LML2_BIP", "BI sample position in frame, when Port 2 is BB2RF" };
+const struct LMS7Parameter LML2_AQP = { 0x0027, 3, 2, 1, "LML2_AQP", "AQ sample position in frame, when Port 2 is BB2RF" };
+const struct LMS7Parameter LML2_AIP = { 0x0027, 1, 0, 0, "LML2_AIP", "AI sample position in frame, when Port 2 is BB2RF" };
+const struct LMS7Parameter LML2_BB2RF_PST = { 0x0028, 15, 8, 1, "LML2_BB2RF_PST", "Number of clock cycles to wait before data drive stop after burst stop is detected in JESD207 mode on Port 2 and Port 2 BB2RF" };
+const struct LMS7Parameter LML2_BB2RF_PRE = { 0x0028, 7, 0, 1, "LML2_BB2RF_PRE", "Number of clock cycles to wait before data drive start after burst start is detected in JESD207 mode on Port 2 and Port 2 BB2RF" };
+const struct LMS7Parameter LML2_RF2BB_PST = { 0x0029, 15, 8, 1, "LML2_RF2BB_PST", "Number of clock cycles to wait before data capture stop after burst stop is detected in JESD207 mode on Port 2 and Port 2 RF2BB" };
+const struct LMS7Parameter LML2_RF2BB_PRE = { 0x0029, 7, 0, 1, "LML2_RF2BB_PRE", "Number of clock cycles to wait before data capture start after burst start is detected in JESD207 mode on Port 2 and Port 2 RF2BB" };
+const struct LMS7Parameter FCLK2_DLY = { 0x002A, 15, 14, 0, "FCLK2_DLY", "" };
+const struct LMS7Parameter FCLK1_DLY = { 0x002A, 13, 12, 0, "FCLK1_DLY", "" };
+const struct LMS7Parameter RX_MUX = { 0x002A, 11, 10, 0, "RX_MUX", "RxFIFO data source selection" };
+const struct LMS7Parameter TX_MUX = { 0x002A, 9, 8, 0, "TX_MUX", "Port selection for data transmit to TSP" };
+const struct LMS7Parameter TXRDCLK_MUX = { 0x002A, 7, 6, 2, "TXRDCLK_MUX", "TX FIFO read clock selection" };
+const struct LMS7Parameter TXWRCLK_MUX = { 0x002A, 5, 4, 0, "TXWRCLK_MUX", "TX FIFO write clock selection" };
+const struct LMS7Parameter RXRDCLK_MUX = { 0x002A, 3, 2, 1, "RXRDCLK_MUX", "RX FIFO read clock selection" };
+const struct LMS7Parameter RXWRCLK_MUX = { 0x002A, 1, 0, 2, "RXWRCLK_MUX", "RX FIFO write clock selection" };
+const struct LMS7Parameter FCLK2_INV = { 0x002B, 15, 15, 0, "FCLK2_INV", "FCLK2 clock inversion" };
+const struct LMS7Parameter FCLK1_INV = { 0x002B, 14, 14, 0, "FCLK1_INV", "FCLK1 clock inversion" };
+const struct LMS7Parameter MCLK2DLY = { 0x002B, 13, 12, 0, "MCLK2DLY", "MCLK2 clock internal delay" };
+const struct LMS7Parameter MCLK1DLY = { 0x002B, 11, 10, 0, "MCLK1DLY", "MCLK1 clock internal delay" };
+const struct LMS7Parameter MCLK2SRC = { 0x002B, 5, 4, 1, "MCLK2SRC", "MCLK2 clock source" };
+const struct LMS7Parameter MCLK1SRC = { 0x002B, 3, 2, 0, "MCLK1SRC", "MCLK1 clock source" };
+const struct LMS7Parameter TXDIVEN = { 0x002B, 1, 1, 0, "TXDIVEN", "TX clock divider enable" };
+const struct LMS7Parameter RXDIVEN = { 0x002B, 0, 0, 0, "RXDIVEN", "RX clock divider enable" };
+const struct LMS7Parameter TXTSPCLKA_DIV = { 0x002C, 15, 8, 255, "TXTSPCLKA_DIV", "TxTSP clock divider, used to produce MCLK(1/2). Clock division ratio is 2(TXTSPCLKA_DIV + 1)"};
+const struct LMS7Parameter RXTSPCLKA_DIV = { 0x002C, 7, 0, 255, "RXTSPCLKA_DIV", "RxTSP clock divider, used to produce MCLK(1/2). Clock division ratio is 2(RXTSPCLKA_DIV + 1)"};
+const struct LMS7Parameter MIMO_SISO = { 0x002E, 15, 15, 0, "MIMO_SISO", "MIMO channel B enable control" };
+const struct LMS7Parameter VER = { 0x002F, 15, 11, 7, "VER", "" };
+const struct LMS7Parameter REV = { 0x002F, 10, 6, 1, "REV", "" };
+const struct LMS7Parameter MASK = { 0x002F, 5, 0, 0, "MASK", "" };
+const struct LMS7Parameter EN_DIR_LDO = { 0x0081, 3, 3, 0, "EN_DIR_LDO", "" };
+const struct LMS7Parameter EN_DIR_CGEN = { 0x0081, 2, 2, 0, "EN_DIR_CGEN", "" };
+const struct LMS7Parameter EN_DIR_XBUF = { 0x0081, 1, 1, 0, "EN_DIR_XBUF", "" };
+const struct LMS7Parameter EN_DIR_AFE = { 0x0081, 0, 0, 0, "EN_DIR_AFE", "" };
+const struct LMS7Parameter ISEL_DAC_AFE = { 0x0082, 15, 13, 4, "ISEL_DAC_AFE", "Controls the peak current of the DAC output current" };
+const struct LMS7Parameter MODE_INTERLEAVE_AFE = { 0x0082, 12, 12, 0, "MODE_INTERLEAVE_AFE", "time interleaves the two ADCs into one ADC" };
+const struct LMS7Parameter MUX_AFE_1 = { 0x0082, 11, 10, 0, "MUX_AFE_1", "Controls the MUX at the input of the ADC channel 1" };
+const struct LMS7Parameter MUX_AFE_2 = { 0x0082, 9, 8, 0, "MUX_AFE_2", "Controls the MUX at the input of the ADC channel 2" };
+const struct LMS7Parameter PD_AFE = { 0x0082, 5, 5, 0, "PD_AFE", "Power down control for the AFE current mirror in BIAS_TOP" };
+const struct LMS7Parameter PD_RX_AFE1 = { 0x0082, 4, 4, 0, "PD_RX_AFE1", "Power down control for the ADC of  channel 1" };
+const struct LMS7Parameter PD_RX_AFE2 = { 0x0082, 3, 3, 1, "PD_RX_AFE2", "Power down control for the ADC of channel 2" };
+const struct LMS7Parameter PD_TX_AFE1 = { 0x0082, 2, 2, 0, "PD_TX_AFE1", "Power down control for the DAC of channel 1" };
+const struct LMS7Parameter PD_TX_AFE2 = { 0x0082, 1, 1, 1, "PD_TX_AFE2", "Power down control for the DAC of channel 2" };
+const struct LMS7Parameter EN_G_AFE = { 0x0082, 0, 0, 1, "EN_G_AFE", "Enable control for all the AFE power downs" };
+const struct LMS7Parameter MUX_BIAS_OUT = { 0x0084, 12, 11, 0, "MUX_BIAS_OUT", "Test mode of the BIAS_TOP" };
+const struct LMS7Parameter RP_CALIB_BIAS = { 0x0084, 10, 6, 16, "RP_CALIB_BIAS", "Calibration code for rppolywo. This code is set by the calibration algorithm: BIAS_RPPOLY_calibration" };
+const struct LMS7Parameter PD_FRP_BIAS = { 0x0084, 4, 4, 0, "PD_FRP_BIAS", "Power down signal for Fix/RP block" };
+const struct LMS7Parameter PD_F_BIAS = { 0x0084, 3, 3, 0, "PD_F_BIAS", "Power down signal for Fix" };
+const struct LMS7Parameter PD_PTRP_BIAS = { 0x0084, 2, 2, 0, "PD_PTRP_BIAS", "Power down signal for PTAT/RP block" };
+const struct LMS7Parameter PD_PT_BIAS = { 0x0084, 1, 1, 0, "PD_PT_BIAS", "Power down signal for PTAT block" };
+const struct LMS7Parameter PD_BIAS_MASTER = { 0x0084, 0, 0, 0, "PD_BIAS_MASTER", "Enable signal for central bias block" };
+const struct LMS7Parameter SLFB_XBUF_RX = { 0x0085, 8, 8, 0, "SLFB_XBUF_RX", "Self biasing digital contol SLFB_XBUF_RX" };
+const struct LMS7Parameter SLFB_XBUF_TX = { 0x0085, 7, 7, 0, "SLFB_XBUF_TX", "Self biasing digital contol SLFB_XBUF_TX" };
+const struct LMS7Parameter BYP_XBUF_RX = { 0x0085, 6, 6, 0, "BYP_XBUF_RX", "Shorts the Input 3.3V buffer in XBUF" };
+const struct LMS7Parameter BYP_XBUF_TX = { 0x0085, 5, 5, 0, "BYP_XBUF_TX", "Shorts the Input 3.3V buffer in XBUF" };
+const struct LMS7Parameter EN_OUT2_XBUF_TX = { 0x0085, 4, 4, 0, "EN_OUT2_XBUF_TX", "Enables the 2nd output of TX XBUF. This 2nd buffer goes to XBUF_RX. This should be active when only 1 XBUF is to be used" };
+const struct LMS7Parameter EN_TBUFIN_XBUF_RX = { 0x0085, 3, 3, 0, "EN_TBUFIN_XBUF_RX", "Disables the input from the external XOSC and buffers the 2nd input signal (from TX XBUF 2nd output) to the RX. This should be active when only 1 XBUF is to be used" };
+const struct LMS7Parameter PD_XBUF_RX = { 0x0085, 2, 2, 0, "PD_XBUF_RX", "Power down signal PD_XBUF_RX" };
+const struct LMS7Parameter PD_XBUF_TX = { 0x0085, 1, 1, 0, "PD_XBUF_TX", "Power down signal PD_XBUF_TX" };
+const struct LMS7Parameter EN_G_XBUF = { 0x0085, 0, 0, 1, "EN_G_XBUF", "Enable control for all the XBUF power downs" };
+const struct LMS7Parameter SPDUP_VCO_CGEN = { 0x0086, 15, 15, 0, "SPDUP_VCO_CGEN", "Bypasses the noise filter resistor for fast setlling time. It should be connected to a 1us pulse" };
+const struct LMS7Parameter RESET_N_CGEN = { 0x0086, 14, 14, 1, "RESET_N_CGEN", "A pulse should be used in the start-up to reset ( 1-normal operation)" };
+const struct LMS7Parameter EN_ADCCLKH_CLKGN = { 0x0086, 11, 11, 1, "EN_ADCCLKH_CLKGN", "Selects if F_CLKH or F_CLKL is connected to FCLK_ADC" };
+const struct LMS7Parameter EN_COARSE_CKLGEN = { 0x0086, 10, 10, 0, "EN_COARSE_CKLGEN", "Enable signal for coarse tuning block" };
+const struct LMS7Parameter EN_INTONLY_SDM_CGEN = { 0x0086, 9, 9, 0, "EN_INTONLY_SDM_CGEN", "Enables INTEGER-N mode of the SX " };
+const struct LMS7Parameter EN_SDM_CLK_CGEN = { 0x0086, 8, 8, 1, "EN_SDM_CLK_CGEN", "Enables/Disables SDM clock. In INT-N mode or for noise testing, SDM clock can be disabled" };
+const struct LMS7Parameter PD_CP_CGEN = { 0x0086, 6, 6, 0, "PD_CP_CGEN", "Power down for Charge Pump" };
+const struct LMS7Parameter PD_FDIV_FB_CGEN = { 0x0086, 5, 5, 0, "PD_FDIV_FB_CGEN", "Power down for feedback frequency divider" };
+const struct LMS7Parameter PD_FDIV_O_CGEN = { 0x0086, 4, 4, 0, "PD_FDIV_O_CGEN", "Power down for forward frequency divider of the CGEN block" };
+const struct LMS7Parameter PD_SDM_CGEN = { 0x0086, 3, 3, 0, "PD_SDM_CGEN", "Power down for SDM" };
+const struct LMS7Parameter PD_VCO_CGEN = { 0x0086, 2, 2, 0, "PD_VCO_CGEN", "Power down for VCO" };
+const struct LMS7Parameter PD_VCO_COMP_CGEN = { 0x0086, 1, 1, 0, "PD_VCO_COMP_CGEN", "Power down for VCO comparator" };
+const struct LMS7Parameter EN_G_CGEN = { 0x0086, 0, 0, 1, "EN_G_CGEN", "Enable control for all the CGEN power downs" };
+const struct LMS7Parameter FRAC_SDM_CGEN_LSB = { 0x0087, 15, 0, 0x0400, "FRAC_SDM_CGEN_LSB", "" };
+const struct LMS7Parameter INT_SDM_CGEN = { 0x0088, 13, 4, 120, "INT_SDM_CGEN", "" };
+const struct LMS7Parameter FRAC_SDM_CGEN_MSB = { 0x0088, 3, 0, 0, "FRAC_SDM_CGEN_MSB", "" };
+const struct LMS7Parameter REV_SDMCLK_CGEN = { 0x0089, 15, 15, 0, "REV_SDMCLK_CGEN", "Reverses the SDM clock" };
+const struct LMS7Parameter SEL_SDMCLK_CGEN = { 0x0089, 14, 14, 0, "SEL_SDMCLK_CGEN", "Selects between the feedback divider output and Fref for SDM" };
+const struct LMS7Parameter SX_DITHER_EN_CGEN = { 0x0089, 13, 13, 0, "SX_DITHER_EN_CGEN", "Enabled dithering in SDM" };
+const struct LMS7Parameter CLKH_OV_CLKL_CGEN = { 0x0089, 12, 11, 0, "CLKH_OV_CLKL_CGEN", "FCLKL here is ADC clock. FCLKH is the clock to the DAC and if no division is added to the ADC as well" };
+const struct LMS7Parameter DIV_OUTCH_CGEN = { 0x0089, 10, 3, 4, "DIV_OUTCH_CGEN", "" };
+const struct LMS7Parameter TST_CGEN = { 0x0089, 2, 0, 0, "TST_CGEN",
+"Controls the test mode of the SX\n\
+0 - TST disabled; RSSI analog outputs enabled if RSSI blocks active and when all PLL test signals are off\n\
+1 - tstdo[0] = ADC clock; tstdo[1] = DAC clock; tstao = High impedance;\n\
+2 - tstdo[0] = SDM clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 60kOhm resistor;\n\
+3 - tstdo[0] = Reference clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 10kOhm resistor;\n\
+4 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = High impedance;\n\
+5 - tstdo[0] = Charge pump Down signal; tstdo[1] = Charge pump Up signal; tstao = High impedance;\n\
+6 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 60kOhm resistor;\n\
+7 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 10kOhm resistor;\n\
+if TST_SX[2] = 1 --> VCO_TSTBUF active generating VCO_TST_DIV20 and VCO_TST_DIV40"};
+const struct LMS7Parameter REV_CLKDAC_CGEN = { 0x008A, 14, 14, 0, "REV_CLKDAC_CGEN", "Inverts the clock F_CLKL" };
+const struct LMS7Parameter CMPLO_CTRL_CGEN = { 0x008A, 27, 14, 0, "CMPLO_CTRL_CGEN", "" };
+const struct LMS7Parameter REV_CLKADC_CGEN = { 0x008A, 13, 13, 0, "REV_CLKADC_CGEN", "Inverts the clock F_CLKL" };
+const struct LMS7Parameter REVPH_PFD_CGEN = { 0x008A, 12, 12, 0, "REVPH_PFD_CGEN", "Reverse the pulses of PFD. It can be used to reverse the polarity of the PLL loop (positive feedback to negative feedback)" };
+const struct LMS7Parameter IOFFSET_CP_CGEN = { 0x008A, 11, 6, 20, "IOFFSET_CP_CGEN", "Scales the offset current of the charge pump, 0-->63. This current is used in Fran-N mode to create an offset in the CP response and avoide the non-linear section" };
+const struct LMS7Parameter IPULSE_CP_CGEN = { 0x008A, 5, 0, 20, "IPULSE_CP_CGEN", "Scales the pulse current of the charge pump" };
+const struct LMS7Parameter ICT_VCO_CGEN = { 0x008B, 13, 9, 16, "ICT_VCO_CGEN", "Scales the VCO bias current from 0 to 2.5xInom" };
+const struct LMS7Parameter CSW_VCO_CGEN = { 0x008B, 8, 1, 128, "CSW_VCO_CGEN", "" };
+const struct LMS7Parameter COARSE_START_CGEN = { 0x008B, 0, 0, 0, "COARSE_START_CGEN", "Control signal for coarse tuning algorithm (SX_SWC_calibration)" };
+const struct LMS7Parameter COARSE_STEPDONE_CGEN = { 0x008C, 15, 15, 0, "COARSE_STEPDONE_CGEN", "" };
+const struct LMS7Parameter COARSEPLL_COMPO_CGEN = { 0x008C, 14, 14, 0, "COARSEPLL_COMPO_CGEN", "" };
+const struct LMS7Parameter VCO_CMPHO_CGEN = { 0x008C, 13, 13, 0, "VCO_CMPHO_CGEN", "" };
+const struct LMS7Parameter VCO_CMPLO_CGEN = { 0x008C, 12, 12, 0, "VCO_CMPLO_CGEN", "" };
+const struct LMS7Parameter CP2_CGEN = { 0x008C, 11, 8, 6, "CP2_CGEN", "Controls the value of CP2 (cap from CP output to GND) in the PLL filter" };
+const struct LMS7Parameter CP3_CGEN = { 0x008C, 7, 4, 7, "CP3_CGEN", "Controls the value of CP3 (cap from VCO Vtune input to GND) in the PLL filter" };
+const struct LMS7Parameter CZ_CGEN = { 0x008C, 3, 0, 11, "CZ_CGEN", "Controls the value of CZ (Zero capacitor) in the PLL filter" };
+const struct LMS7Parameter EN_LDO_DIG = { 0x0092, 15, 15, 0, "EN_LDO_DIG", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIGGN = { 0x0092, 14, 14, 0, "EN_LDO_DIGGN", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIGSXR = { 0x0092, 13, 13, 0, "EN_LDO_DIGSXR", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIGSXT = { 0x0092, 12, 12, 0, "EN_LDO_DIGSXT", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIVGN = { 0x0092, 11, 11, 0, "EN_LDO_DIVGN", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIVSXR = { 0x0092, 10, 10, 0, "EN_LDO_DIVSXR", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_DIVSXT = { 0x0092, 9, 9, 0, "EN_LDO_DIVSXT", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_LNA12 = { 0x0092, 8, 8, 0, "EN_LDO_LNA12", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_LNA14 = { 0x0092, 7, 7, 0, "EN_LDO_LNA14", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_MXRFE = { 0x0092, 6, 6, 0, "EN_LDO_MXRFE", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_RBB = { 0x0092, 5, 5, 0, "EN_LDO_RBB", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_RXBUF = { 0x0092, 4, 4, 0, "EN_LDO_RXBUF", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TBB = { 0x0092, 3, 3, 0, "EN_LDO_TBB", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TIA12 = { 0x0092, 2, 2, 0, "EN_LDO_TIA12", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TIA14 = { 0x0092, 1, 1, 0, "EN_LDO_TIA14", "Enables the LDO" };
+const struct LMS7Parameter EN_G_LDO = { 0x0092, 0, 0, 1, "EN_G_LDO", "Enable control for all the LDO power downs" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TLOB = { 0x0093, 15, 15, 0, "EN_LOADIMP_LDO_TLOB", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TPAD = { 0x0093, 14, 14, 0, "EN_LOADIMP_LDO_TPAD", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TXBUF = { 0x0093, 13, 13, 0, "EN_LOADIMP_LDO_TXBUF", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_VCOGN = { 0x0093, 12, 12, 0, "EN_LOADIMP_LDO_VCOGN", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_VCOSXR = { 0x0093, 11, 11, 0, "EN_LOADIMP_LDO_VCOSXR", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_VCOSXT = { 0x0093, 10, 10, 0, "EN_LOADIMP_LDO_VCOSXT", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LDO_AFE = { 0x0093, 9, 9, 0, "EN_LDO_AFE", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_CPGN = { 0x0093, 8, 8, 0, "EN_LDO_CPGN", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_CPSXR = { 0x0093, 7, 7, 0, "EN_LDO_CPSXR", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TLOB = { 0x0093, 6, 6, 0, "EN_LDO_TLOB", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TPAD = { 0x0093, 5, 5, 0, "EN_LDO_TPAD", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_TXBUF = { 0x0093, 4, 4, 0, "EN_LDO_TXBUF", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_VCOGN = { 0x0093, 3, 3, 0, "EN_LDO_VCOGN", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_VCOSXR = { 0x0093, 2, 2, 0, "EN_LDO_VCOSXR", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_VCOSXT = { 0x0093, 1, 1, 0, "EN_LDO_VCOSXT", "Enables the LDO" };
+const struct LMS7Parameter EN_LDO_CPSXT = { 0x0093, 0, 0, 0, "EN_LDO_CPSXT", "Enables the LDO" };
+const struct LMS7Parameter EN_LOADIMP_LDO_CPSXT = { 0x0094, 15, 15, 0, "EN_LOADIMP_LDO_CPSXT", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIG = { 0x0094, 14, 14, 0, "EN_LOADIMP_LDO_DIG", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIGGN = { 0x0094, 13, 13, 0, "EN_LOADIMP_LDO_DIGGN", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIGSXR = { 0x0094, 12, 12, 0, "EN_LOADIMP_LDO_DIGSXR", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIGSXT = { 0x0094, 11, 11, 0, "EN_LOADIMP_LDO_DIGSXT", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIVGN = { 0x0094, 10, 10, 0, "EN_LOADIMP_LDO_DIVGN", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIVSXR = { 0x0094, 9, 9, 0, "EN_LOADIMP_LDO_DIVSXR", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIVSXT = { 0x0094, 8, 8, 0, "EN_LOADIMP_LDO_DIVSXT", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_LNA12 = { 0x0094, 7, 7, 0, "EN_LOADIMP_LDO_LNA12", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_LNA14 = { 0x0094, 6, 6, 0, "EN_LOADIMP_LDO_LNA14", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_MXRFE = { 0x0094, 5, 5, 0, "EN_LOADIMP_LDO_MXRFE", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_RBB = { 0x0094, 4, 4, 0, "EN_LOADIMP_LDO_RBB", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_RXBUF = { 0x0094, 3, 3, 0, "EN_LOADIMP_LDO_RXBUF", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TBB = { 0x0094, 2, 2, 0, "EN_LOADIMP_LDO_TBB", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TIA12 = { 0x0094, 1, 1, 0, "EN_LOADIMP_LDO_TIA12", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_TIA14 = { 0x0094, 0, 0, 0, "EN_LOADIMP_LDO_TIA14", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter BYP_LDO_TBB = { 0x0095, 15, 15, 0, "BYP_LDO_TBB", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_TIA12 = { 0x0095, 14, 14, 0, "BYP_LDO_TIA12", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_TIA14 = { 0x0095, 13, 13, 0, "BYP_LDO_TIA14", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_TLOB = { 0x0095, 12, 12, 0, "BYP_LDO_TLOB", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_TPAD = { 0x0095, 11, 11, 0, "BYP_LDO_TPAD", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_TXBUF = { 0x0095, 10, 10, 0, "BYP_LDO_TXBUF", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_VCOGN = { 0x0095, 9, 9, 0, "BYP_LDO_VCOGN", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_VCOSXR = { 0x0095, 8, 8, 0, "BYP_LDO_VCOSXR", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_VCOSXT = { 0x0095, 7, 7, 0, "BYP_LDO_VCOSXT", "Bypass signal for the LDO" };
+const struct LMS7Parameter EN_LOADIMP_LDO_AFE = { 0x0095, 2, 2, 0, "EN_LOADIMP_LDO_AFE", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_CPGN = { 0x0095, 1, 1, 0, "EN_LOADIMP_LDO_CPGN", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_CPSXR = { 0x0095, 0, 0, 0, "EN_LOADIMP_LDO_CPSXR", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter BYP_LDO_AFE = { 0x0096, 15, 15, 0, "BYP_LDO_AFE", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_CPGN = { 0x0096, 14, 14, 0, "BYP_LDO_CPGN", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_CPSXR = { 0x0096, 13, 13, 0, "BYP_LDO_CPSXR", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_CPSXT = { 0x0096, 12, 12, 0, "BYP_LDO_CPSXT", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIG = { 0x0096, 11, 11, 0, "BYP_LDO_DIG", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIGGN = { 0x0096, 10, 10, 0, "BYP_LDO_DIGGN", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIGSXR = { 0x0096, 9, 9, 0, "BYP_LDO_DIGSXR", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIGSXT = { 0x0096, 8, 8, 0, "BYP_LDO_DIGSXT", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIVGN = { 0x0096, 7, 7, 0, "BYP_LDO_DIVGN", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIVSXR = { 0x0096, 6, 6, 0, "BYP_LDO_DIVSXR", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIVSXT = { 0x0096, 5, 5, 0, "BYP_LDO_DIVSXT", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_LNA12 = { 0x0096, 4, 4, 0, "BYP_LDO_LNA12", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_LNA14 = { 0x0096, 3, 3, 0, "BYP_LDO_LNA14", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_MXRFE = { 0x0096, 2, 2, 0, "BYP_LDO_MXRFE", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_RBB = { 0x0096, 1, 1, 0, "BYP_LDO_RBB", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_RXBUF = { 0x0096, 0, 0, 0, "BYP_LDO_RXBUF", "Bypass signal for the LDO" };
+const struct LMS7Parameter SPDUP_LDO_DIVSXR = { 0x0097, 15, 15, 0, "SPDUP_LDO_DIVSXR", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIVSXT = { 0x0097, 14, 14, 0, "SPDUP_LDO_DIVSXT", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_LNA12 = { 0x0097, 13, 13, 0, "SPDUP_LDO_LNA12", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_LNA14 = { 0x0097, 12, 12, 0, "SPDUP_LDO_LNA14", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_MXRFE = { 0x0097, 11, 11, 0, "SPDUP_LDO_MXRFE", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_RBB = { 0x0097, 10, 10, 0, "SPDUP_LDO_RBB", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_RXBUF = { 0x0097, 9, 9, 0, "SPDUP_LDO_RXBUF", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TBB = { 0x0097, 8, 8, 0, "SPDUP_LDO_TBB", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TIA12 = { 0x0097, 7, 7, 0, "SPDUP_LDO_TIA12", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TIA14 = { 0x0097, 6, 6, 0, "SPDUP_LDO_TIA14", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TLOB = { 0x0097, 5, 5, 0, "SPDUP_LDO_TLOB", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TPAD = { 0x0097, 4, 4, 0, "SPDUP_LDO_TPAD", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_TXBUF = { 0x0097, 3, 3, 0, "SPDUP_LDO_TXBUF", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_VCOGN = { 0x0097, 2, 2, 0, "SPDUP_LDO_VCOGN", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_VCOSXR = { 0x0097, 1, 1, 0, "SPDUP_LDO_VCOSXR", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_VCOSXT = { 0x0097, 0, 0, 0, "SPDUP_LDO_VCOSXT", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_AFE = { 0x0098, 8, 8, 0, "SPDUP_LDO_AFE", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_CPGN = { 0x0098, 7, 7, 0, "SPDUP_LDO_CPGN", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_CPSXR = { 0x0098, 6, 6, 0, "SPDUP_LDO_CPSXR", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_CPSXT = { 0x0098, 5, 5, 0, "SPDUP_LDO_CPSXT", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIG = { 0x0098, 4, 4, 0, "SPDUP_LDO_DIG", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIGGN = { 0x0098, 3, 3, 0, "SPDUP_LDO_DIGGN", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIGSXR = { 0x0098, 2, 2, 0, "SPDUP_LDO_DIGSXR", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIGSXT = { 0x0098, 1, 1, 0, "SPDUP_LDO_DIGSXT", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIVGN = { 0x0098, 0, 0, 0, "SPDUP_LDO_DIVGN", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter RDIV_VCOSXR = { 0x0099, 15, 8, 101, "RDIV_VCOSXR", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_VCOSXT = { 0x0099, 7, 0, 101, "RDIV_VCOSXT", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TXBUF = { 0x009A, 15, 8, 101, "RDIV_TXBUF", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_VCOGN = { 0x009A, 7, 0, 140, "RDIV_VCOGN", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TLOB = { 0x009B, 15, 8, 101, "RDIV_TLOB", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TPAD = { 0x009B, 7, 0, 101, "RDIV_TPAD", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TIA12 = { 0x009C, 15, 8, 101, "RDIV_TIA12", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TIA14 = { 0x009C, 7, 0, 140, "RDIV_TIA14", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_RXBUF = { 0x009D, 15, 8, 101, "RDIV_RXBUF", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_TBB = { 0x009D, 7, 0, 101, "RDIV_TBB", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_MXRFE = { 0x009E, 15, 8, 101, "RDIV_MXRFE", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_RBB = { 0x009E, 7, 0, 140, "RDIV_RBB", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_LNA12 = { 0x009F, 15, 8, 101, "RDIV_LNA12", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_LNA14 = { 0x009F, 7, 0, 140, "RDIV_LNA14", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIVSXR = { 0x00A0, 15, 8, 101, "RDIV_DIVSXR", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIVSXT = { 0x00A0, 7, 0, 101, "RDIV_DIVSXT", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIGSXT = { 0x00A1, 15, 8, 101, "RDIV_DIGSXT", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIVGN = { 0x00A1, 7, 0, 101, "RDIV_DIVGN", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIGGN = { 0x00A2, 15, 8, 101, "RDIV_DIGGN", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIGSXR = { 0x00A2, 7, 0, 101, "RDIV_DIGSXR", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_CPSXT = { 0x00A3, 15, 8, 101, "RDIV_CPSXT", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIG = { 0x00A3, 7, 0, 101, "RDIV_DIG", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_CPGN = { 0x00A4, 15, 8, 101, "RDIV_CPGN", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_CPSXR = { 0x00A4, 7, 0, 101, "RDIV_CPSXR", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_SPIBUF = { 0x00A5, 15, 8, 101, "RDIV_SPIBUF", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_AFE = { 0x00A5, 7, 0, 101, "RDIV_AFE", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter SPDUP_LDO_SPIBUF = { 0x00A6, 12, 12, 0, "SPDUP_LDO_SPIBUF", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIGIp2 = { 0x00A6, 11, 11, 0, "SPDUP_LDO_DIGIp2", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter SPDUP_LDO_DIGIp1 = { 0x00A6, 10, 10, 0, "SPDUP_LDO_DIGIp1", "Short the noise filter resistor to speed up the settling time" };
+const struct LMS7Parameter BYP_LDO_SPIBUF = { 0x00A6, 9, 9, 0, "BYP_LDO_SPIBUF", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIGIp2 = { 0x00A6, 8, 8, 0, "BYP_LDO_DIGIp2", "Bypass signal for the LDO" };
+const struct LMS7Parameter BYP_LDO_DIGIp1 = { 0x00A6, 7, 7, 0, "BYP_LDO_DIGIp1", "Bypass signal for the LDO" };
+const struct LMS7Parameter EN_LOADIMP_LDO_SPIBUF = { 0x00A6, 6, 6, 0, "EN_LOADIMP_LDO_SPIBUF", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIGIp2 = { 0x00A6, 5, 5, 0, "EN_LOADIMP_LDO_DIGIp2", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter EN_LOADIMP_LDO_DIGIp1 = { 0x00A6, 4, 4, 0, "EN_LOADIMP_LDO_DIGIp1", "Enables the load dependent bias to optimize the load regulation" };
+const struct LMS7Parameter PD_LDO_SPIBUF = { 0x00A6, 3, 3, 1, "PD_LDO_SPIBUF", "Enables the LDO" };
+const struct LMS7Parameter PD_LDO_DIGIp2 = { 0x00A6, 2, 2, 1, "PD_LDO_DIGIp2", "Enables the LDO" };
+const struct LMS7Parameter PD_LDO_DIGIp1 = { 0x00A6, 1, 1, 1, "PD_LDO_DIGIp1", "Enables the LDO" };
+const struct LMS7Parameter EN_G_LDOP = { 0x00A6, 0, 0, 1, "EN_G_LDOP", "Enable control for all the LDO power downs" };
+const struct LMS7Parameter RDIV_DIGIp2 = { 0x00A7, 15, 8, 101, "RDIV_DIGIp2", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter RDIV_DIGIp1 = { 0x00A7, 7, 0, 101, "RDIV_DIGIp1", "Controls the output voltage of the LDO by setting the resistive voltage divider ratio" };
+const struct LMS7Parameter BSIGT = { 0x00A8, 31, 9, 0, "BSIGT", "" };
+const struct LMS7Parameter BSTATE = { 0x00A8, 8, 8, 0, "BSTATE", "" };
+const struct LMS7Parameter EN_SDM_TSTO_SXT = { 0x00A8, 6, 6, 0, "EN_SDM_TSTO_SXT", "Enables the SDM_TSTO_SXT" };
+const struct LMS7Parameter EN_SDM_TSTO_SXR = { 0x00A8, 5, 5, 0, "EN_SDM_TSTO_SXR", "Enables the SDM_TSTO_SXR" };
+const struct LMS7Parameter EN_SDM_TSTO_CGEN = { 0x00A8, 4, 4, 0, "EN_SDM_TSTO_CGEN", "Enables the SDM_TSTO_CGEN" };
+const struct LMS7Parameter BENC = { 0x00A8, 3, 3, 0, "BENC", "enables CGEN BIST" };
+const struct LMS7Parameter BENR = { 0x00A8, 2, 2, 0, "BENR", "enables SXR BIST" };
+const struct LMS7Parameter BENT = { 0x00A8, 1, 1, 0, "BENT", "enables SXT BIST" };
+const struct LMS7Parameter BSTART = { 0x00A8, 0, 0, 0, "BSTART", "Starts delta sigma built in self test. Keep it at 1 one at least three clock cycles" };
+const struct LMS7Parameter BSIGR = { 0x00AA, 22, 0, 0, "BSIGR", "" };
+const struct LMS7Parameter BSIGC = { 0x00AB, 29, 7, 0, "BSIGC", "" };
+const struct LMS7Parameter CDS_MCLK2 = { 0x00AD, 15, 14, 0, "CDS_MCLK2", "MCLK2 clock delay" };
+const struct LMS7Parameter CDS_MCLK1 = { 0x00AD, 13, 12, 0, "CDS_MCLK1", "MCLK1 clock delay" };
+const struct LMS7Parameter CDSN_TXBTSP = { 0x00AD, 9, 9, 1, "CDSN_TXBTSP", "TX TSPB clock inversion control" };
+const struct LMS7Parameter CDSN_TXATSP = { 0x00AD, 8, 8, 1, "CDSN_TXATSP", "TX TSPA clock inversion control" };
+const struct LMS7Parameter CDSN_RXBTSP = { 0x00AD, 7, 7, 1, "CDSN_RXBTSP", "RX TSPB clock inversion control" };
+const struct LMS7Parameter CDSN_RXATSP = { 0x00AD, 6, 6, 1, "CDSN_RXATSP", "RX TSPA clock inversion control" };
+const struct LMS7Parameter CDSN_TXBLML = { 0x00AD, 5, 5, 1, "CDSN_TXBLML", "TX LMLB clock inversion control" };
+const struct LMS7Parameter CDSN_TXALML = { 0x00AD, 4, 4, 1, "CDSN_TXALML", "TX LMLA clock inversion control" };
+const struct LMS7Parameter CDSN_RXBLML = { 0x00AD, 3, 3, 1, "CDSN_RXBLML", "RX LMLB clock inversion control" };
+const struct LMS7Parameter CDSN_RXALML = { 0x00AD, 2, 2, 1, "CDSN_RXALML", "RX LMLA clock inversion control" };
+const struct LMS7Parameter CDSN_MCLK2 = { 0x00AD, 1, 1, 1, "CDSN_MCLK2", "MCLK2 clock inversion control" };
+const struct LMS7Parameter CDSN_MCLK1 = { 0x00AD, 0, 0, 1, "CDSN_MCLK1", "MCLK1 clock inversion control" };
+const struct LMS7Parameter CDS_TXBTSP = { 0x00AE, 15, 14, 0, "CDS_TXBTSP", "TX TSP B clock delay" };
+const struct LMS7Parameter CDS_TXATSP = { 0x00AE, 13, 12, 0, "CDS_TXATSP", "TX TSP A clock delay" };
+const struct LMS7Parameter CDS_RXBTSP = { 0x00AE, 11, 10, 0, "CDS_RXBTSP", "RX TSP B clock delay" };
+const struct LMS7Parameter CDS_RXATSP = { 0x00AE, 9, 8, 0, "CDS_RXATSP", "RX TSP A clock delay" };
+const struct LMS7Parameter CDS_TXBLML = { 0x00AE, 7, 6, 0, "CDS_TXBLML", "TX LML B clock delay" };
+const struct LMS7Parameter CDS_TXALML = { 0x00AE, 5, 4, 0, "CDS_TXALML", "TX LML A clock delay" };
+const struct LMS7Parameter CDS_RXBLML = { 0x00AE, 3, 2, 0, "CDS_RXBLML", "RX LML B clock delay" };
+const struct LMS7Parameter CDS_RXALML = { 0x00AE, 1, 0, 0, "CDS_RXALML", "RX LML A clock delay" };
+const struct LMS7Parameter EN_LOWBWLOMX_TMX_TRF = { 0x0100, 15, 15, 0, "EN_LOWBWLOMX_TMX_TRF", "Controls the high pass pole frequency of the RC biasing the gate of the mixer switches" };
+const struct LMS7Parameter EN_NEXTTX_TRF = { 0x0100, 14, 14, 0, "EN_NEXTTX_TRF", "Enables the daisy change LO buffer going from TRF_1 to TRF2" };
+const struct LMS7Parameter EN_AMPHF_PDET_TRF = { 0x0100, 13, 12, 3, "EN_AMPHF_PDET_TRF", "Enables the TXPAD power detector preamplifier" };
+const struct LMS7Parameter LOADR_PDET_TRF = { 0x0100, 11, 10, 1, "LOADR_PDET_TRF", "Controls the resistive load of the Power detector" };
+const struct LMS7Parameter PD_PDET_TRF = { 0x0100, 3, 3, 1, "PD_PDET_TRF", "Powerdown signal for Power Detector" };
+const struct LMS7Parameter PD_TLOBUF_TRF = { 0x0100, 2, 2, 0, "PD_TLOBUF_TRF", "Powerdown signal for TX LO buffer" };
+const struct LMS7Parameter PD_TXPAD_TRF = { 0x0100, 1, 1, 0, "PD_TXPAD_TRF", "Powerdown signal for TXPAD" };
+const struct LMS7Parameter EN_G_TRF = { 0x0100, 0, 0, 1, "EN_G_TRF", "Enable control for all the TRF_1 power downs" };
+const struct LMS7Parameter F_TXPAD_TRF = { 0x0101, 15, 13, 3, "F_TXPAD_TRF", "Controls the switched capacitor at the TXPAD output. Is used for fine tuning of the TXPAD output" };
+const struct LMS7Parameter L_LOOPB_TXPAD_TRF = { 0x0101, 12, 11, 3, "L_LOOPB_TXPAD_TRF", "Controls the loss of the of the loopback path at the TX side" };
+const struct LMS7Parameter LOSS_LIN_TXPAD_TRF = { 0x0101, 10, 6, 0, "LOSS_LIN_TXPAD_TRF", "Controls the gain of the linearizing part of of the TXPAD" };
+const struct LMS7Parameter LOSS_MAIN_TXPAD_TRF = { 0x0101, 5, 1, 0, "LOSS_MAIN_TXPAD_TRF", "Controls the gain  output power of the TXPAD" };
+const struct LMS7Parameter EN_LOOPB_TXPAD_TRF = { 0x0101, 0, 0, 0, "EN_LOOPB_TXPAD_TRF", "Enables the TXPAD loopback path" };
+const struct LMS7Parameter GCAS_GNDREF_TXPAD_TRF = { 0x0102, 15, 15, 0, "GCAS_GNDREF_TXPAD_TRF", "Controls if the TXPAD cascode transistor gate bias is referred to VDD or GND" };
+const struct LMS7Parameter ICT_LIN_TXPAD_TRF = { 0x0102, 14, 10, 12, "ICT_LIN_TXPAD_TRF", "Control the bias current of the linearization section of the TXPAD" };
+const struct LMS7Parameter ICT_MAIN_TXPAD_TRF = { 0x0102, 9, 5, 12, "ICT_MAIN_TXPAD_TRF", "Control the bias current of the main gm section of the TXPAD" };
+const struct LMS7Parameter VGCAS_TXPAD_TRF = { 0x0102, 4, 0, 0, "VGCAS_TXPAD_TRF", "Controls the bias voltage at the gate of TXPAD cascade" };
+const struct LMS7Parameter SEL_BAND1_TRF = { 0x0103, 11, 11, 1, "SEL_BAND1_TRF", "" };
+const struct LMS7Parameter SEL_BAND2_TRF = { 0x0103, 10, 10, 0, "SEL_BAND2_TRF", "" };
+const struct LMS7Parameter LOBIASN_TXM_TRF = { 0x0103, 9, 5, 16, "LOBIASN_TXM_TRF", "Controls the bias at the gate of the mixer NMOS" };
+const struct LMS7Parameter LOBIASP_TXX_TRF = { 0x0103, 4, 0, 18, "LOBIASP_TXX_TRF", "Controls the bias at the gate of the mixer PMOS" };
+const struct LMS7Parameter CDC_I_TRF = { 0x0104, 7, 4, 8, "CDC_I_TRF", "" };
+const struct LMS7Parameter CDC_Q_TRF = { 0x0104, 3, 0, 8, "CDC_Q_TRF", "" };
+const struct LMS7Parameter STATPULSE_TBB = { 0x0105, 15, 15, 0, "STATPULSE_TBB", "" };
+const struct LMS7Parameter LOOPB_TBB = { 0x0105, 14, 12, 0, "LOOPB_TBB", "This controls which signal is connected to the loopback output pins. Note: when both the lowpass ladder and real pole are powered down, the output of the active highband biquad is routed to the loopb output" };
+const struct LMS7Parameter PD_LPFH_TBB = { 0x0105, 4, 4, 0, "PD_LPFH_TBB", "This selectively powers down the LPFH_TBB biquad" };
+const struct LMS7Parameter PD_LPFIAMP_TBB = { 0x0105, 3, 3, 0, "PD_LPFIAMP_TBB", "selectively powers down the LPFIAMP_TBB front-end current amp of the transmitter baseband" };
+const struct LMS7Parameter PD_LPFLAD_TBB = { 0x0105, 2, 2, 1, "PD_LPFLAD_TBB", "This selectively powers down the LPFLAD_TBB low pass ladder filter of the transmitter baseband" };
+const struct LMS7Parameter PD_LPFS5_TBB = { 0x0105, 1, 1, 1, "PD_LPFS5_TBB", "This selectively powers down the LPFS5_TBB low pass real-pole filter of the transmitter baseband" };
+const struct LMS7Parameter EN_G_TBB = { 0x0105, 0, 0, 1, "EN_G_TBB", "Enable control for all the TBB_TOP power downs" };
+const struct LMS7Parameter ICT_LPFS5_F_TBB = { 0x0106, 14, 10, 12, "ICT_LPFS5_F_TBB", "This controls the operational amplifier's output stage bias current of the low band real pole filter of the transmitter's baseband" };
+const struct LMS7Parameter ICT_LPFS5_PT_TBB = { 0x0106, 9, 5, 12, "ICT_LPFS5_PT_TBB", "This controls the operational amplifier's input stage bias current of the low band real pole filter of the transmitter's baseband" };
+const struct LMS7Parameter ICT_LPF_H_PT_TBB = { 0x0106, 4, 0, 12, "ICT_LPF_H_PT_TBB", "This controls the operational amplifiers input stage bias reference current of the high band low pass filter of the transmitter's baseband " };
+const struct LMS7Parameter ICT_LPFH_F_TBB = { 0x0107, 14, 10, 12, "ICT_LPFH_F_TBB", "controls the operational amplifiers output stage bias reference current of the high band low pass filter of the transmitter's baseband (LPFH_TBB)" };
+const struct LMS7Parameter ICT_LPFLAD_F_TBB = { 0x0107, 9, 5, 12, "ICT_LPFLAD_F_TBB", "This controls the operational amplfiers' output stages bias referene current of the low band ladder filter of the transmisster's baseband" };
+const struct LMS7Parameter ICT_LPFLAD_PT_TBB = { 0x0107, 4, 0, 12, "ICT_LPFLAD_PT_TBB", "This controls the operational amplifers' input stages bias reference current of the low band ladder filter of the transmitter's baseband" };
+const struct LMS7Parameter CG_IAMP_TBB = { 0x0108, 15, 10, 37, "CG_IAMP_TBB", "This controls the frontend gain of the TBB. For a given gain value, this control value varies with the set TX mode. After resistance calibration, the following table gives the nominal values for each frequency setting. However, this table is to be updated and corrected after calibration" };
+const struct LMS7Parameter ICT_IAMP_FRP_TBB = { 0x0108, 9, 5, 1, "ICT_IAMP_FRP_TBB", "This controls the reference bias current of the IAMP main bias current sources" };
+const struct LMS7Parameter ICT_IAMP_GG_FRP_TBB = { 0x0108, 4, 0, 6, "ICT_IAMP_GG_FRP_TBB", "This controls the reference bias current of the IAMP's cascode transistors gate voltages that set the IAMP's input voltage level. The IAMP's input is connected to the DAC output" };
+const struct LMS7Parameter RCAL_LPFH_TBB = { 0x0109, 15, 8, 97, "RCAL_LPFH_TBB", "This controls the value of the equivalent resistance of the resistor banks of the biquad filter stage (of the high band section) of the transmitter baseband(TBB)" };
+const struct LMS7Parameter RCAL_LPFLAD_TBB = { 0x0109, 7, 0, 193, "RCAL_LPFLAD_TBB", "This controls the value of the equivalent resistance of the resistor banks of the low pass filter ladder (of the low band section) of the transmitter baseband(TBB)" };
+const struct LMS7Parameter TSTIN_TBB = { 0x010A, 15, 14, 0, "TSTIN_TBB", "This control selects where the input test signal (vinp/n_aux_bbq/i) is routed to as well as disabling the route." };
+const struct LMS7Parameter BYPLADDER_TBB = { 0x010A, 13, 13, 0, "BYPLADDER_TBB", "This signal bypasses the LPF ladder of TBB and directly connects the output of current amplifier to the null port of the real pole stage of TBB low pass filter" };
+const struct LMS7Parameter CCAL_LPFLAD_TBB = { 0x010A, 12, 8, 16, "CCAL_LPFLAD_TBB", "A common control signal for all the capacitor banks of TBB filters (including the ladder, real pole, and the high band biquad). It is the calibrated value of the banks control that sets the value of the banks' equivalent capacitor to their respective nominal values" };
+const struct LMS7Parameter RCAL_LPFS5_TBB = { 0x010A, 7, 0, 76, "RCAL_LPFS5_TBB", "This controls the value of the equivalent resistance of the resistor banks of the real pole filter stage (of the low band section) of the transmitter baseband (TBB). Following is a nominal values table that are corrected for any process variation after calibration" };
+const struct LMS7Parameter CDC_I_RFE = { 0x010C, 15, 12, 8, "CDC_I_RFE", "" };
+const struct LMS7Parameter CDC_Q_RFE = { 0x010C, 11, 8, 8, "CDC_Q_RFE", "" };
+const struct LMS7Parameter PD_LNA_RFE = { 0x010C, 7, 7, 1, "PD_LNA_RFE", "Power control signal for LNA_RFE" };
+const struct LMS7Parameter PD_RLOOPB_1_RFE = { 0x010C, 6, 6, 1, "PD_RLOOPB_1_RFE", "Power control signal for RXFE loopback 1" };
+const struct LMS7Parameter PD_RLOOPB_2_RFE = { 0x010C, 5, 5, 1, "PD_RLOOPB_2_RFE", "Power control signal for RXFE loopback 2" };
+const struct LMS7Parameter PD_MXLOBUF_RFE = { 0x010C, 4, 4, 1, "PD_MXLOBUF_RFE", "Power control signal for RXFE mixer lo buffer" };
+const struct LMS7Parameter PD_QGEN_RFE = { 0x010C, 3, 3, 1, "PD_QGEN_RFE", "Power control signal for RXFE Quadrature LO generator" };
+const struct LMS7Parameter PD_RSSI_RFE = { 0x010C, 2, 2, 1, "PD_RSSI_RFE", "Power control signal for RXFE RSSI" };
+const struct LMS7Parameter PD_TIA_RFE = { 0x010C, 1, 1, 0, "PD_TIA_RFE", "Power control signal for RXFE TIA" };
+const struct LMS7Parameter EN_G_RFE = { 0x010C, 0, 0, 1, "EN_G_RFE", "Enable control for all the RFE_1 power downs" };
+const struct LMS7Parameter SEL_PATH_RFE = { 0x010D, 8, 7, 1, "SEL_PATH_RFE", "Selects the active path of the RXFE" };
+const struct LMS7Parameter EN_DCOFF_RXFE_RFE = { 0x010D, 6, 6, 0, "EN_DCOFF_RXFE_RFE", "Enables the DCOFFSET block for the RXFE" };
+const struct LMS7Parameter EN_INSHSW_LB1_RFE = { 0x010D, 4, 4, 1, "EN_INSHSW_LB1_RFE", "Enables the input shorting switch at the input  of the loopback 1 (in parallel with LNAL mixer)" };
+const struct LMS7Parameter EN_INSHSW_LB2_RFE = { 0x010D, 3, 3, 1, "EN_INSHSW_LB2_RFE", "Enables the input shorting switch at the input  of the loopback 2 (in parallel with LNAW mixer)" };
+const struct LMS7Parameter EN_INSHSW_L_RFE = { 0x010D, 2, 2, 1, "EN_INSHSW_L_RFE", "Enables the input shorting switch at the input  of the LNAL" };
+const struct LMS7Parameter EN_INSHSW_W_RFE = { 0x010D, 1, 1, 1, "EN_INSHSW_W_RFE", "Enables the input shorting switch at the input  of the LNAW" };
+const struct LMS7Parameter EN_NEXTRX_RFE = { 0x010D, 0, 0, 0, "EN_NEXTRX_RFE", "Enables the daisy chain LO buffer going from RXFE1  to RXFE2" };
+const struct LMS7Parameter DCOFFI_RFE = { 0x010E, 13, 7, 64, "DCOFFI_RFE", "Controls DC offset at the output of the TIA by injecting current to the input of the TIA (I side)" };
+const struct LMS7Parameter DCOFFQ_RFE = { 0x010E, 6, 0, 64, "DCOFFQ_RFE", "Controls DC offset at the output of the TIA by injecting current to the input of the TIA (Q side)" };
+const struct LMS7Parameter ICT_LOOPB_RFE = { 0x010F, 14, 10, 12, "ICT_LOOPB_RFE", "Controls the reference current of the RXFE loopback amplifier" };
+const struct LMS7Parameter ICT_TIAMAIN_RFE = { 0x010F, 9, 5, 2, "ICT_TIAMAIN_RFE", "Controls the reference current of the RXFE TIA first stage" };
+const struct LMS7Parameter ICT_TIAOUT_RFE = { 0x010F, 4, 0, 2, "ICT_TIAOUT_RFE", "Controls the reference current of the RXFE TIA 2nd stage" };
+const struct LMS7Parameter ICT_LNACMO_RFE = { 0x0110, 14, 10, 2, "ICT_LNACMO_RFE", "Controls the current generating LNA output common mode voltage" };
+const struct LMS7Parameter ICT_LNA_RFE = { 0x0110, 9, 5, 31, "ICT_LNA_RFE", "Controls the current of the LNA core" };
+const struct LMS7Parameter ICT_LODC_RFE = { 0x0110, 4, 0, 20, "ICT_LODC_RFE", "Controls the DC of the mixer LO signal at the gate of the mixer switches" };
+const struct LMS7Parameter CAP_RXMXO_RFE = { 0x0111, 9, 5, 4, "CAP_RXMXO_RFE", "Control the decoupling cap at the output of the RX Mixer" };
+const struct LMS7Parameter CGSIN_LNA_RFE = { 0x0111, 4, 0, 3, "CGSIN_LNA_RFE", "Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the maching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3" };
+const struct LMS7Parameter CCOMP_TIA_RFE = { 0x0112, 15, 12, 12, "CCOMP_TIA_RFE", "Compensation capacitor for TIA" };
+const struct LMS7Parameter CFB_TIA_RFE = { 0x0112, 11, 0, 230, "CFB_TIA_RFE", "Feeback capacitor for TIA. Controls the 3dB BW of the TIA. Should be set with calibration through digital baseband" };
+const struct LMS7Parameter G_LNA_RFE = { 0x0113, 9, 6, 15, "G_LNA_RFE", "Controls the gain of the LNA" };
+const struct LMS7Parameter G_RXLOOPB_RFE = { 0x0113, 5, 2, 0, "G_RXLOOPB_RFE", "Controls RXFE loopback gain" };
+const struct LMS7Parameter G_TIA_RFE = { 0x0113, 1, 0, 3, "G_TIA_RFE", "Controls the Gain of the TIA" };
+const struct LMS7Parameter RCOMP_TIA_RFE = { 0x0114, 8, 5, 4, "RCOMP_TIA_RFE", "Controls the compensation resistors of the TIA opamp" };
+const struct LMS7Parameter RFB_TIA_RFE = { 0x0114, 4, 0, 13, "RFB_TIA_RFE", "Sets the feedback resistor to the nominal value" };
+const struct LMS7Parameter EN_LB_LPFH_RBB = { 0x0115, 15, 15, 0, "EN_LB_LPFH_RBB", "" };
+const struct LMS7Parameter EN_LB_LPFL_RBB = { 0x0115, 14, 14, 0, "EN_LB_LPFL_RBB", "" };
+const struct LMS7Parameter PD_LPFH_RBB = { 0x0115, 3, 3, 1, "PD_LPFH_RBB", "Power down of the LPFH block" };
+const struct LMS7Parameter PD_LPFL_RBB = { 0x0115, 2, 2, 0, "PD_LPFL_RBB", "Power down of the LPFL block" };
+const struct LMS7Parameter PD_PGA_RBB = { 0x0115, 1, 1, 0, "PD_PGA_RBB", "Power down of the PGA block" };
+const struct LMS7Parameter EN_G_RBB = { 0x0115, 0, 0, 1, "EN_G_RBB", "Enable control for all the RBB_1 power downs" };
+const struct LMS7Parameter R_CTL_LPF_RBB = { 0x0116, 15, 11, 16, "R_CTL_LPF_RBB", "Controls the absolute value of the resistance of the RC time constant of the RBB_LPF blocks (both Low and High)" };
+const struct LMS7Parameter RCC_CTL_LPFH_RBB = { 0x0116, 10, 8, 1, "RCC_CTL_LPFH_RBB", "Controls the stability passive compensation of the LPFH_RBB operational amplifier" };
+const struct LMS7Parameter C_CTL_LPFH_RBB = { 0x0116, 7, 0, 128, "C_CTL_LPFH_RBB", "Controls the capacitance value of the RC time constant of RBB_LPFH and it varies with the respective rxMode from 37MHz to 108MHz" };
+const struct LMS7Parameter RCC_CTL_LPFL_RBB = { 0x0117, 13, 11, 5, "RCC_CTL_LPFL_RBB", "Controls the stability passive compensation of the LPFL_RBB operational amplifier" };
+const struct LMS7Parameter C_CTL_LPFL_RBB = { 0x0117, 10, 0, 12, "C_CTL_LPFL_RBB", "Controls the capacitance value of the RC time constant of RBB_LPFH and it varies with the respective rxMode from 1.4MHz to 20MHz." };
+const struct LMS7Parameter INPUT_CTL_PGA_RBB = { 0x0118, 15, 13, 0, "INPUT_CTL_PGA_RBB", "There are a total of four different differential inputs to the PGA. Only one of them is active at a time" };
+const struct LMS7Parameter ICT_LPF_IN_RBB = { 0x0118, 9, 5, 12, "ICT_LPF_IN_RBB", "Controls the reference bias current of the input stage of the operational amplifier used in RBB_LPF blocks (Low or High). " };
+const struct LMS7Parameter ICT_LPF_OUT_RBB = { 0x0118, 4, 0, 12, "ICT_LPF_OUT_RBB", "The reference bias current of the output stage of the operational amplifier used in RBB_LPF blocks (low or High)" };
+const struct LMS7Parameter OSW_PGA_RBB = { 0x0119, 15, 15, 0, "OSW_PGA_RBB", "There are two instances of the PGA circuit in the design. The output of the RBB_LPF blocks are connected the input of these PGA blocks (common). The output of one of them is connected to two pads pgaoutn and pgaoutp and the output of the other PGA is connected directly to the ADC input" };
+const struct LMS7Parameter ICT_PGA_OUT_RBB = { 0x0119, 14, 10, 6, "ICT_PGA_OUT_RBB", "Controls the output stage reference bias current of the operational amplifier used in the PGA circuit" };
+const struct LMS7Parameter ICT_PGA_IN_RBB = { 0x0119, 9, 5, 6, "ICT_PGA_IN_RBB", "Controls the input stage reference bias current of the operational amplifier used in the PGA circuit" };
+const struct LMS7Parameter G_PGA_RBB = { 0x0119, 4, 0, 11, "G_PGA_RBB", "This is the gain of the PGA" };
+const struct LMS7Parameter RCC_CTL_PGA_RBB = { 0x011A, 13, 9, 23, "RCC_CTL_PGA_RBB", "Controls the stability passive compensation of the PGA_RBB operational amplifier" };
+const struct LMS7Parameter C_CTL_PGA_RBB = { 0x011A, 6, 0, 2, "C_CTL_PGA_RBB", "Control the value of the feedback capacitor of the PGA that is used to help against the parasitic cap at the virtual node for stability" };
+const struct LMS7Parameter RESET_N = { 0x011C, 15, 15, 1, "RESET_N", "Resets SX. A pulse should be used in the start-up to reset" };
+const struct LMS7Parameter SPDUP_VCO = { 0x011C, 14, 14, 0, "SPDUP_VCO", "Bypasses the noise filter resistor for fast settling time. It should be connected to a 1uS pulse" };
+const struct LMS7Parameter BYPLDO_VCO = { 0x011C, 13, 13, 1, "BYPLDO_VCO", "Controls the bypass signal for the SX LDO" };
+const struct LMS7Parameter EN_COARSEPLL = { 0x011C, 12, 12, 0, "EN_COARSEPLL", "Enable signal for coarse tuning block" };
+const struct LMS7Parameter CURLIM_VCO = { 0x011C, 11, 11, 1, "CURLIM_VCO", "Enables the output current limitation in the VCO regulator" };
+const struct LMS7Parameter EN_DIV2_DIVPROG = { 0x011C, 10, 10, 1, "EN_DIV2_DIVPROG", "" };
+const struct LMS7Parameter EN_INTONLY_SDM = { 0x011C, 9, 9, 0, "EN_INTONLY_SDM", "Enables INTEGER-N mode of the SX " };
+const struct LMS7Parameter EN_SDM_CLK = { 0x011C, 8, 8, 1, "EN_SDM_CLK", "Enables/Disables SDM clock. In INT-N mode or for noise testing, SDM clock can be disabled" };
+const struct LMS7Parameter PD_FBDIV = { 0x011C, 7, 7, 0, "PD_FBDIV", "Power down the feedback divider block" };
+const struct LMS7Parameter PD_LOCH_T2RBUF = { 0x011C, 6, 6, 1, "PD_LOCH_T2RBUF", "Power down for LO buffer from SXT to SXR. To be active only in the TDD mode" };
+const struct LMS7Parameter PD_CP = { 0x011C, 5, 5, 0, "PD_CP", "Power down for Charge Pump" };
+const struct LMS7Parameter PD_FDIV = { 0x011C, 4, 4, 0, "PD_FDIV", "Power down for feedback frequency and forward dividers" };
+const struct LMS7Parameter PD_SDM = { 0x011C, 3, 3, 0, "PD_SDM", "Power down for SDM" };
+const struct LMS7Parameter PD_VCO_COMP = { 0x011C, 2, 2, 0, "PD_VCO_COMP", "Power down for VCO comparator" };
+const struct LMS7Parameter PD_VCO = { 0x011C, 1, 1, 1, "PD_VCO", "Power down for VCO" };
+const struct LMS7Parameter EN_G = { 0x011C, 0, 0, 1, "EN_G", "Enable control for all the SXT power downs" };
+const struct LMS7Parameter FRAC_SDM_LSB = { 0x011D, 15, 0, 0x0400, "FRAC_SDM_LSB", "" };
+const struct LMS7Parameter INT_SDM = { 0x011E, 13, 4, 120, "INT_SDM", "" };
+const struct LMS7Parameter FRAC_SDM_MSB = { 0x011E, 3, 0, 0, "FRAC_SDM_MSB", "" };
+const struct LMS7Parameter PW_DIV2_LOCH = { 0x011F, 14, 12, 3, "PW_DIV2_LOCH", "trims the duty cycle of DIV2 LOCH. Only works when forward divider is dividing by at least 2 (excluding quadrature block division). If in bypass mode, this does not work" };
+const struct LMS7Parameter PW_DIV4_LOCH = { 0x011F, 11, 9, 3, "PW_DIV4_LOCH", "trims the duty cycle of DIV4 LOCH. Only works when forward divider is dividing by at least 4 (excluding quadrature block division). If in bypass mode, this does not work" };
+const struct LMS7Parameter DIV_LOCH = { 0x011F, 8, 6, 1, "DIV_LOCH", "Controls the division ratio in the LOCH_DIV" };
+const struct LMS7Parameter TST_SX = { 0x011F, 5, 3, 0, "TST_SX",
+"Controls the test mode of PLLs. TST signal lines are shared between all PLLs (CGEN, RX and TX). Only one TST signal of any PLL should be active at a given time.\n\
+0 - TST disabled; RSSI analog outputs enabled if RSSI blocks active and when all PLL test signals are off(default)\n\
+1 - tstdo[0] = VCO / 20 clock*; tstdo[1] = VCO / 40 clock*; tstao = High impedance;\n\
+2 - tstdo[0] = SDM clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 60kOhm resistor;\n\
+3 - tstdo[0] = Reference clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 10kOhm resistor;\n\
+4 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = High impedance;\n\
+5 - tstdo[0] = Charge pump Down signal; tstdo[1] = Charge pump Up signal; tstao = High impedance;\n\
+6 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 60kOhm resistor;\n\
+7 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 10kOhm resistor;\n\
+if TST_SX[2] = 1 --> VCO_TSTBUF active generating VCO_TST_DIV20 and VCO_TST_DIV40\n\
+* When EN_DIV2_DIVPROG_(SXR, SXT) is active, the division ratio must be multiplied by 2 (40 / 80)"};
+const struct LMS7Parameter SEL_SDMCLK = { 0x011F, 2, 2, 0, "SEL_SDMCLK", "Selects between the feedback divider output and Fref for SDM" };
+const struct LMS7Parameter SX_DITHER_EN = { 0x011F, 1, 1, 0, "SX_DITHER_EN", "Enabled dithering in SDM" };
+const struct LMS7Parameter REV_SDMCLK = { 0x011F, 0, 0, 0, "REV_SDMCLK", "Reverses the SDM clock" };
+const struct LMS7Parameter VDIV_VCO = { 0x0120, 15, 8, 185, "VDIV_VCO", "Controls VCO LDO output voltage" };
+const struct LMS7Parameter ICT_VCO = { 0x0120, 7, 0, 255, "ICT_VCO", "Scales the VCO bias current from 0 to 2.5xInom" };
+const struct LMS7Parameter RSEL_LDO_VCO = { 0x0121, 15, 11, 6, "RSEL_LDO_VCO", "Set the reference voltage that supplies bias voltage of switch-cap array and varactor" };
+const struct LMS7Parameter CSW_VCO = { 0x0121, 10, 3, 128, "CSW_VCO", "Coarse control of VCO frequency, 0 for lowest frequency and 255 for highest. This control is set by SX_SWC_calibration" };
+const struct LMS7Parameter SEL_VCO = { 0x0121, 2, 1, 2, "SEL_VCO", "Selects the active VCO. It is set by SX_SWC_calibration" };
+const struct LMS7Parameter COARSE_START = { 0x0121, 0, 0, 0, "COARSE_START", "" };
+const struct LMS7Parameter REVPH_PFD = { 0x0122, 12, 12, 0, "REVPH_PFD", "Reverse the pulses of PFD. It can be used to reverse the polarity of the PLL loop (positive feedback to negative feedback)" };
+const struct LMS7Parameter IOFFSET_CP = { 0x0122, 11, 6, 12, "IOFFSET_CP", "Scales the offset current of the charge pump, 0-->63. This current is used in Fran-N mode to create an offset in the CP response and avoid the non-linear section" };
+const struct LMS7Parameter IPULSE_CP = { 0x0122, 5, 0, 63, "IPULSE_CP", "Scales the pulse current of the charge pump" };
+const struct LMS7Parameter COARSE_STEPDONE = { 0x0123, 15, 15, 0, "COARSE_STEPDONE", "" };
+const struct LMS7Parameter COARSEPLL_COMPO = { 0x0123, 14, 14, 0, "COARSEPLL_COMPO", "" };
+const struct LMS7Parameter VCO_CMPHO = { 0x0123, 13, 13, 0, "VCO_CMPHO", "" };
+const struct LMS7Parameter VCO_CMPLO = { 0x0123, 12, 12, 0, "VCO_CMPLO", "" };
+const struct LMS7Parameter CP2_PLL = { 0x0123, 11, 8, 6, "CP2_PLL", "Controls the value of CP2 (cap from CP output to GND) in the PLL filter" };
+const struct LMS7Parameter CP3_PLL = { 0x0123, 7, 4, 7, "CP3_PLL", "Controls the value of CP3 (cap from VCO Vtune input to GND) in the PLL filter" };
+const struct LMS7Parameter CZ = { 0x0123, 3, 0, 11, "CZ", "Controls the value of CZ (Zero capacitor) in the PLL filter" };
+const struct LMS7Parameter EN_DIR_SXRSXT = { 0x0124, 4, 4, 0, "EN_DIR_SXRSXT", "Enables direct control of PDs and ENs for SXR/SXT module" };
+const struct LMS7Parameter EN_DIR_RBB = { 0x0124, 3, 3, 0, "EN_DIR_RBB", "Enables direct control of PDs and ENs for RBB module" };
+const struct LMS7Parameter EN_DIR_RFE = { 0x0124, 2, 2, 0, "EN_DIR_RFE", "Enables direct control of PDs and ENs for RFE module" };
+const struct LMS7Parameter EN_DIR_TBB = { 0x0124, 1, 1, 0, "EN_DIR_TBB", "Enables direct control of PDs and ENs for TBB module" };
+const struct LMS7Parameter EN_DIR_TRF = { 0x0124, 0, 0, 0, "EN_DIR_TRF", "Enables direct control of PDs and ENs for TRF module" };
+const struct LMS7Parameter TSGFC_TXTSP = { 0x0200, 9, 9, 0, "TSGFC_TXTSP", "TSG full scale control" };
+const struct LMS7Parameter TSGFCW_TXTSP = { 0x0200, 8, 7, 1, "TSGFCW_TXTSP", "Set frequency of TSG's NCO" };
+const struct LMS7Parameter TSGDCLDQ_TXTSP = { 0x0200, 6, 6, 0, "TSGDCLDQ_TXTSP", "" };
+const struct LMS7Parameter TSGDCLDI_TXTSP = { 0x0200, 5, 5, 0, "TSGDCLDI_TXTSP", "" };
+const struct LMS7Parameter TSGSWAPIQ_TXTSP = { 0x0200, 4, 4, 0, "TSGSWAPIQ_TXTSP", "Swap signals at test signal generator's output" };
+const struct LMS7Parameter TSGMODE_TXTSP = { 0x0200, 3, 3, 0, "TSGMODE_TXTSP", "Test signal generator mode" };
+const struct LMS7Parameter INSEL_TXTSP = { 0x0200, 2, 2, 0, "INSEL_TXTSP", "Input source of TxTSP" };
+const struct LMS7Parameter BSTART_TXTSP = { 0x0200, 1, 1, 0, "BSTART_TXTSP", "Starts delta sigma built in self test. Keep it at 1 one at least three clock cycles" };
+const struct LMS7Parameter EN_TXTSP = { 0x0200, 0, 0, 1, "EN_TXTSP", "TxTSP modules enable" };
+const struct LMS7Parameter GCORRQ_TXTSP = { 0x0201, 10, 0, 2047, "GCORRQ_TXTSP", "corrector value, channel Q Unsigned integer" };
+const struct LMS7Parameter GCORRI_TXTSP = { 0x0202, 10, 0, 2047, "GCORRI_TXTSP", "corrector value, channel I Unsigned integer" };
+const struct LMS7Parameter HBI_OVR_TXTSP = { 0x0203, 14, 12, 0, "HBI_OVR_TXTSP", "HBI interpolation ratio" };
+const struct LMS7Parameter IQCORR_TXTSP = { 0x0203, 11, 0, 0, "IQCORR_TXTSP", "Phase corrector value (tan(Alpha/2)). Integer, 2's complement" };
+const struct LMS7Parameter DCCORRI_TXTSP = { 0x0204, 15, 8, 0, "DCCORRI_TXTSP", "DC corrector value, channel I. Integer, 2's complement" };
+const struct LMS7Parameter DCCORRQ_TXTSP = { 0x0204, 7, 0, 0, "DCCORRQ_TXTSP", "DC corrector value, channel Q. Integer, 2's complement" };
+const struct LMS7Parameter GFIR1_L_TXTSP = { 0x0205, 10, 8, 0, "GFIR1_L_TXTSP", "Parameter l of GFIR1 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR1_N_TXTSP = { 0x0205, 7, 0, 0, "GFIR1_N_TXTSP", "Clock division ratio of GFIR1 is GFIR1_N + 1. Unsigned integer" };
+const struct LMS7Parameter GFIR2_L_TXTSP = { 0x0206, 10, 8, 0, "GFIR2_L_TXTSP", "Parameter l of GFIR2 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR2_N_TXTSP = { 0x0206, 7, 0, 0, "GFIR2_N_TXTSP", "Clock division ratio of GFIR2 is GFIR2_N + 1. Unsigned integer" };
+const struct LMS7Parameter GFIR3_L_TXTSP = { 0x0207, 10, 8, 0, "GFIR3_L_TXTSP", "Parameter l of GFIR3 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR3_N_TXTSP = { 0x0207, 7, 0, 0, "GFIR3_N_TXTSP", "Clock division ratio of GFIR3 is GFIR3_N + 1. Unsigned integer" };
+const struct LMS7Parameter CMIX_GAIN_TXTSP = { 0x0208, 15, 14, 0, "CMIX_GAIN_TXTSP", "Gain of CMIX output" };
+const struct LMS7Parameter CMIX_SC_TXTSP = { 0x0208, 13, 13, 0, "CMIX_SC_TXTSP", "Spectrum control of CMIX" };
+const struct LMS7Parameter CMIX_BYP_TXTSP = { 0x0208, 8, 8, 0, "CMIX_BYP_TXTSP", "CMIX bypass" };
+const struct LMS7Parameter ISINC_BYP_TXTSP = { 0x0208, 7, 7, 0, "ISINC_BYP_TXTSP", "ISINC bypass" };
+const struct LMS7Parameter GFIR3_BYP_TXTSP = { 0x0208, 6, 6, 0, "GFIR3_BYP_TXTSP", "GFIR3 bypass" };
+const struct LMS7Parameter GFIR2_BYP_TXTSP = { 0x0208, 5, 5, 0, "GFIR2_BYP_TXTSP", "GFIR2 bypass" };
+const struct LMS7Parameter GFIR1_BYP_TXTSP = { 0x0208, 4, 4, 0, "GFIR1_BYP_TXTSP", "GFIR1 bypass" };
+const struct LMS7Parameter DC_BYP_TXTSP = { 0x0208, 3, 3, 0, "DC_BYP_TXTSP", "DC corrector bypass" };
+const struct LMS7Parameter GC_BYP_TXTSP = { 0x0208, 1, 1, 0, "GC_BYP_TXTSP", "Gain corrector bypass" };
+const struct LMS7Parameter PH_BYP_TXTSP = { 0x0208, 0, 0, 0, "PH_BYP_TXTSP", "Phase corrector bypass" };
+const struct LMS7Parameter BSIGI_TXTSP = { 0x0209, 23, 1, 0, "BSIGI_TXTSP", "" };
+const struct LMS7Parameter BSTATE_TXTSP = { 0x0209, 0, 0, 0, "BSTATE_TXTSP", "" };
+const struct LMS7Parameter BSIGQ_TXTSP = { 0x020A, 30, 8, 0, "BSIGQ_TXTSP", "" };
+const struct LMS7Parameter DC_REG_TXTSP = { 0x020C, 15, 0, 0, "DC_REG_TXTSP", "" };
+const struct LMS7Parameter DTHBIT_TX = { 0x0240, 8, 5, 1, "DTHBIT_TX", "NCO bits to dither" };
+const struct LMS7Parameter SEL_TX = { 0x0240, 4, 1, 0, "SEL_TX", "" };
+const struct LMS7Parameter MODE_TX = { 0x0240, 0, 0, 0, "MODE_TX", "" };
+const struct LMS7Parameter CAPTURE = { 0x0400, 15, 15, 0, "CAPTURE", "" };
+const struct LMS7Parameter CAPSEL = { 0x0400, 14, 13, 0, "CAPSEL", "" };
+const struct LMS7Parameter CAPSEL_ADC = { 0x0400, 12, 12, 0, "CAPSEL_ADC", "" };
+const struct LMS7Parameter TSGFC_RXTSP = { 0x0400, 9, 9, 0, "TSGFC_RXTSP", "TSG full scale control" };
+const struct LMS7Parameter TSGFCW_RXTSP = { 0x0400, 8, 7, 1, "TSGFCW_RXTSP", "Set frequency of TSG's NCO" };
+const struct LMS7Parameter TSGDCLDQ_RXTSP = { 0x0400, 6, 6, 0, "TSGDCLDQ_RXTSP", "" };
+const struct LMS7Parameter TSGDCLDI_RXTSP = { 0x0400, 5, 5, 0, "TSGDCLDI_RXTSP", "" };
+const struct LMS7Parameter TSGSWAPIQ_RXTSP = { 0x0400, 4, 4, 0, "TSGSWAPIQ_RXTSP", "Swap signals at test signal generator's output" };
+const struct LMS7Parameter TSGMODE_RXTSP = { 0x0400, 3, 3, 0, "TSGMODE_RXTSP", "Test signal generator mode" };
+const struct LMS7Parameter INSEL_RXTSP = { 0x0400, 2, 2, 0, "INSEL_RXTSP", "Input source of RxTSP" };
+const struct LMS7Parameter BSTART_RXTSP = { 0x0400, 1, 1, 0, "BSTART_RXTSP", "Starts delta sigma built in self test. Keep it at 1 one at least three clock cycles" };
+const struct LMS7Parameter EN_RXTSP = { 0x0400, 0, 0, 1, "EN_RXTSP", "RxTSP modules enable" };
+const struct LMS7Parameter GCORRQ_RXTSP = { 0x0401, 10, 0, 2047, "GCORRQ_RXTSP", "corrector value, channel Q Unsigned integer" };
+const struct LMS7Parameter GCORRI_RXTSP = { 0x0402, 10, 0, 2047, "GCORRI_RXTSP", "corrector value, channel I Unsigned integer" };
+const struct LMS7Parameter HBD_OVR_RXTSP = { 0x0403, 14, 12, 0, "HBD_OVR_RXTSP", "HBD interpolation ratio. Interpolation ratio is 2HBD_OVR+1" };
+const struct LMS7Parameter IQCORR_RXTSP = { 0x0403, 11, 0, 0, "IQCORR_RXTSP", "Phase corrector value (tan(Alpha/2)). Integer, 2's complement" };
+const struct LMS7Parameter HBD_DLY = { 0x0404, 15, 13, 0, "HBD_DLY", "" };
+const struct LMS7Parameter DCLOOP_BYP = { 0x0404, 8, 8, 0, "DCLOOP_BYP", "" };
+const struct LMS7Parameter DCCORR_AVG_RXTSP = { 0x0404, 2, 0, 0, "DCCORR_AVG_RXTSP", "Number of samples to average for Automatic DC corrector. Number of samples to average is 2DCCORR_AVG + 12" };
+const struct LMS7Parameter GFIR1_L_RXTSP = { 0x0405, 10, 8, 0, "GFIR1_L_RXTSP", "Parameter l of GFIR1 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR1_N_RXTSP = { 0x0405, 7, 0, 0, "GFIR1_N_RXTSP", "Clock division ratio of GFIR1 is GFIR1_N + 1. Unsigned integer" };
+const struct LMS7Parameter GFIR2_L_RXTSP = { 0x0406, 10, 8, 0, "GFIR2_L_RXTSP", "Parameter l of GFIR2 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR2_N_RXTSP = { 0x0406, 7, 0, 0, "GFIR2_N_RXTSP", "Clock division ratio of GFIR2 is GFIR2_N + 1. Unsigned integer" };
+const struct LMS7Parameter GFIR3_L_RXTSP = { 0x0407, 10, 8, 0, "GFIR3_L_RXTSP", "Parameter l of GFIR3 (l = roundUp(CoeffN/5)-1). Unsigned integer" };
+const struct LMS7Parameter GFIR3_N_RXTSP = { 0x0407, 7, 0, 0, "GFIR3_N_RXTSP", "Clock division ratio of GFIR3 is GFIR3_N + 1. Unsigned integer" };
+const struct LMS7Parameter AGC_K_RXTSP = { 0x0408, 17, 0, 0, "AGC_K_RXTSP", "AGC loop gain" };
+const struct LMS7Parameter AGC_ADESIRED_RXTSP = { 0x0409, 15, 4, 0, "AGC_ADESIRED_RXTSP", "AGC_ADESIRED" };
+const struct LMS7Parameter RSSI_MODE = { 0x040A, 15, 14, 0, "RSSI_MODE", "" };
+const struct LMS7Parameter AGC_MODE_RXTSP = { 0x040A, 13, 12, 0, "AGC_MODE_RXTSP", "" };
+const struct LMS7Parameter AGC_AVG_RXTSP = { 0x040A, 2, 0, 0, "AGC_AVG_RXTSP", "AGC Averaging window size" };
+const struct LMS7Parameter DC_REG_RXTSP = { 0x040B, 15, 0, 0, "DC_REG_RXTSP", "" };
+const struct LMS7Parameter CMIX_GAIN_RXTSP = { 0x040C, 15, 14, 0, "CMIX_GAIN_RXTSP", "Gain of CMIX output" };
+const struct LMS7Parameter CMIX_SC_RXTSP = { 0x040C, 13, 13, 0, "CMIX_SC_RXTSP", "Spectrum control of CMIX" };
+const struct LMS7Parameter CMIX_BYP_RXTSP = { 0x040C, 7, 7, 0, "CMIX_BYP_RXTSP", "CMIX bypass" };
+const struct LMS7Parameter AGC_BYP_RXTSP = { 0x040C, 6, 6, 0, "AGC_BYP_RXTSP", "AGC bypass" };
+const struct LMS7Parameter GFIR3_BYP_RXTSP = { 0x040C, 5, 5, 0, "GFIR3_BYP_RXTSP", "GFIR3 bypass" };
+const struct LMS7Parameter GFIR2_BYP_RXTSP = { 0x040C, 4, 4, 0, "GFIR2_BYP_RXTSP", "GFIR2 bypass" };
+const struct LMS7Parameter GFIR1_BYP_RXTSP = { 0x040C, 3, 3, 0, "GFIR1_BYP_RXTSP", "GFIR1 bypass" };
+const struct LMS7Parameter DC_BYP_RXTSP = { 0x040C, 2, 2, 0, "DC_BYP_RXTSP", "DC corrector bypass" };
+const struct LMS7Parameter GC_BYP_RXTSP = { 0x040C, 1, 1, 0, "GC_BYP_RXTSP", "Gain corrector bypass" };
+const struct LMS7Parameter PH_BYP_RXTSP = { 0x040C, 0, 0, 0, "PH_BYP_RXTSP", "Phase corrector bypass" };
+const struct LMS7Parameter CAPD = { 0x040E, 31, 0, 0, "CAPD", "" };
+const struct LMS7Parameter DTHBIT_RX = { 0x0440, 8, 5, 1, "DTHBIT_RX", "NCO bits to dither" };
+const struct LMS7Parameter SEL_RX = { 0x0440, 4, 1, 0, "SEL_RX", "" };
+const struct LMS7Parameter MODE_RX = { 0x0440, 0, 0, 0, "MODE_RX", "" };
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.h
new file mode 100644
index 0000000000000000000000000000000000000000..3fc4e0be6bbc956592d42cc99ae00b95851805af
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_parameters.h
@@ -0,0 +1,613 @@
+/**
+@file	LMS7002M_parameters.h
+@author Lime Microsystems (www.limemicro.com)
+@brief 	List of LMS7002M transceiver control parameters
+*/
+
+#ifndef LMS7002M_PARAMETERS_H
+#define LMS7002M_PARAMETERS_H
+
+#include "typedefs.h"
+#include <vector>
+
+struct LMS7Parameter;
+extern std::vector<const LMS7Parameter*> LMS7parameterList;
+
+struct LMS7Parameter
+{
+    LMS7Parameter() : address(0), msb(0), lsb(0), defaultValue(0), name(nullptr), tooltip(nullptr)
+    {
+    }
+
+    LMS7Parameter(uint16_t address, uint8_t msb, uint8_t lsb, uint16_t defaultValue, const char *name, const char* tooltip)
+        : address(address), msb(msb), lsb(lsb), defaultValue(defaultValue), name(name), tooltip(tooltip)
+    {
+        LMS7parameterList.push_back(this);
+    }
+
+    uint16_t address;
+    uint8_t msb;
+    uint8_t lsb;
+    uint16_t defaultValue;
+    const char* name;
+    const char* tooltip;
+    inline bool operator==(const LMS7Parameter& obj)
+    {
+        if (address == obj.address && msb == obj.msb && lsb == obj.lsb)
+            return true;
+        return false;
+    };
+};
+
+extern const struct LMS7Parameter LRST_TX_B;
+extern const struct LMS7Parameter MRST_TX_B;
+extern const struct LMS7Parameter LRST_TX_A;
+extern const struct LMS7Parameter MRST_TX_A;
+extern const struct LMS7Parameter LRST_RX_B;
+extern const struct LMS7Parameter MRST_RX_B;
+extern const struct LMS7Parameter LRST_RX_A;
+extern const struct LMS7Parameter MRST_RX_A;
+extern const struct LMS7Parameter SRST_RXFIFO;
+extern const struct LMS7Parameter SRST_TXFIFO;
+extern const struct LMS7Parameter RXEN_B;
+extern const struct LMS7Parameter RXEN_A;
+extern const struct LMS7Parameter TXEN_B;
+extern const struct LMS7Parameter TXEN_A;
+extern const struct LMS7Parameter MAC;
+extern const struct LMS7Parameter TX_CLK_PE;
+extern const struct LMS7Parameter RX_CLK_PE;
+extern const struct LMS7Parameter SDA_PE;
+extern const struct LMS7Parameter SDA_DS;
+extern const struct LMS7Parameter SCL_PE;
+extern const struct LMS7Parameter SCL_DS;
+extern const struct LMS7Parameter SDIO_DS;
+extern const struct LMS7Parameter SDIO_PE;
+extern const struct LMS7Parameter SDO_PE;
+extern const struct LMS7Parameter SCLK_PE;
+extern const struct LMS7Parameter SEN_PE;
+extern const struct LMS7Parameter SPIMODE;
+extern const struct LMS7Parameter DIQ2_DS;
+extern const struct LMS7Parameter DIQ2_PE;
+extern const struct LMS7Parameter IQ_SEL_EN_2_PE;
+extern const struct LMS7Parameter TXNRX2_PE;
+extern const struct LMS7Parameter FCLK2_PE;
+extern const struct LMS7Parameter MCLK2_PE;
+extern const struct LMS7Parameter DIQ1_DS;
+extern const struct LMS7Parameter DIQ1_PE;
+extern const struct LMS7Parameter IQ_SEL_EN_1_PE;
+extern const struct LMS7Parameter TXNRX1_PE;
+extern const struct LMS7Parameter FCLK1_PE;
+extern const struct LMS7Parameter MCLK1_PE;
+extern const struct LMS7Parameter DIQDIRCTR2;
+extern const struct LMS7Parameter DIQDIR2;
+extern const struct LMS7Parameter DIQDIRCTR1;
+extern const struct LMS7Parameter DIQDIR1;
+extern const struct LMS7Parameter ENABLEDIRCTR2;
+extern const struct LMS7Parameter ENABLEDIR2;
+extern const struct LMS7Parameter ENABLEDIRCTR1;
+extern const struct LMS7Parameter ENABLEDIR1;
+extern const struct LMS7Parameter MOD_EN;
+extern const struct LMS7Parameter LML2_FIDM;
+extern const struct LMS7Parameter LML2_TXNRXIQ;
+extern const struct LMS7Parameter LML2_MODE;
+extern const struct LMS7Parameter LML1_FIDM;
+extern const struct LMS7Parameter LML1_TXNRXIQ;
+extern const struct LMS7Parameter LML1_MODE;
+extern const struct LMS7Parameter LML1_S3S;
+extern const struct LMS7Parameter LML1_S2S;
+extern const struct LMS7Parameter LML1_S1S;
+extern const struct LMS7Parameter LML1_S0S;
+extern const struct LMS7Parameter LML1_BQP;
+extern const struct LMS7Parameter LML1_BIP;
+extern const struct LMS7Parameter LML1_AQP;
+extern const struct LMS7Parameter LML1_AIP;
+extern const struct LMS7Parameter LML1_BB2RF_PST;
+extern const struct LMS7Parameter LML1_BB2RF_PRE;
+extern const struct LMS7Parameter LML1_RF2BB_PST;
+extern const struct LMS7Parameter LML1_RF2BB_PRE;
+extern const struct LMS7Parameter LML2_S3S;
+extern const struct LMS7Parameter LML2_S2S;
+extern const struct LMS7Parameter LML2_S1S;
+extern const struct LMS7Parameter LML2_S0S;
+extern const struct LMS7Parameter LML2_BQP;
+extern const struct LMS7Parameter LML2_BIP;
+extern const struct LMS7Parameter LML2_AQP;
+extern const struct LMS7Parameter LML2_AIP;
+extern const struct LMS7Parameter LML2_BB2RF_PST;
+extern const struct LMS7Parameter LML2_BB2RF_PRE;
+extern const struct LMS7Parameter LML2_RF2BB_PST;
+extern const struct LMS7Parameter LML2_RF2BB_PRE;
+extern const struct LMS7Parameter FCLK2_DLY;
+extern const struct LMS7Parameter FCLK1_DLY;
+extern const struct LMS7Parameter RX_MUX;
+extern const struct LMS7Parameter TX_MUX;
+extern const struct LMS7Parameter TXRDCLK_MUX;
+extern const struct LMS7Parameter TXWRCLK_MUX;
+extern const struct LMS7Parameter RXRDCLK_MUX;
+extern const struct LMS7Parameter RXWRCLK_MUX;
+extern const struct LMS7Parameter FCLK2_INV;
+extern const struct LMS7Parameter FCLK1_INV;
+extern const struct LMS7Parameter MCLK2DLY;
+extern const struct LMS7Parameter MCLK1DLY;
+extern const struct LMS7Parameter MCLK2SRC;
+extern const struct LMS7Parameter MCLK1SRC;
+extern const struct LMS7Parameter TXDIVEN;
+extern const struct LMS7Parameter RXDIVEN;
+extern const struct LMS7Parameter TXTSPCLKA_DIV;
+extern const struct LMS7Parameter RXTSPCLKA_DIV;
+extern const struct LMS7Parameter MIMO_SISO;
+extern const struct LMS7Parameter VER;
+extern const struct LMS7Parameter REV;
+extern const struct LMS7Parameter MASK;
+extern const struct LMS7Parameter EN_DIR_LDO;
+extern const struct LMS7Parameter EN_DIR_CGEN;
+extern const struct LMS7Parameter EN_DIR_XBUF;
+extern const struct LMS7Parameter EN_DIR_AFE;
+extern const struct LMS7Parameter ISEL_DAC_AFE;
+extern const struct LMS7Parameter MODE_INTERLEAVE_AFE;
+extern const struct LMS7Parameter MUX_AFE_1;
+extern const struct LMS7Parameter MUX_AFE_2;
+extern const struct LMS7Parameter PD_AFE;
+extern const struct LMS7Parameter PD_RX_AFE1;
+extern const struct LMS7Parameter PD_RX_AFE2;
+extern const struct LMS7Parameter PD_TX_AFE1;
+extern const struct LMS7Parameter PD_TX_AFE2;
+extern const struct LMS7Parameter EN_G_AFE;
+extern const struct LMS7Parameter MUX_BIAS_OUT;
+extern const struct LMS7Parameter RP_CALIB_BIAS;
+extern const struct LMS7Parameter PD_FRP_BIAS;
+extern const struct LMS7Parameter PD_F_BIAS;
+extern const struct LMS7Parameter PD_PTRP_BIAS;
+extern const struct LMS7Parameter PD_PT_BIAS;
+extern const struct LMS7Parameter PD_BIAS_MASTER;
+extern const struct LMS7Parameter SLFB_XBUF_RX;
+extern const struct LMS7Parameter SLFB_XBUF_TX;
+extern const struct LMS7Parameter BYP_XBUF_RX;
+extern const struct LMS7Parameter BYP_XBUF_TX;
+extern const struct LMS7Parameter EN_OUT2_XBUF_TX;
+extern const struct LMS7Parameter EN_TBUFIN_XBUF_RX;
+extern const struct LMS7Parameter PD_XBUF_RX;
+extern const struct LMS7Parameter PD_XBUF_TX;
+extern const struct LMS7Parameter EN_G_XBUF;
+extern const struct LMS7Parameter SPDUP_VCO_CGEN;
+extern const struct LMS7Parameter RESET_N_CGEN;
+extern const struct LMS7Parameter EN_ADCCLKH_CLKGN;
+extern const struct LMS7Parameter EN_COARSE_CKLGEN;
+extern const struct LMS7Parameter EN_INTONLY_SDM_CGEN;
+extern const struct LMS7Parameter EN_SDM_CLK_CGEN;
+extern const struct LMS7Parameter PD_CP_CGEN;
+extern const struct LMS7Parameter PD_FDIV_FB_CGEN;
+extern const struct LMS7Parameter PD_FDIV_O_CGEN;
+extern const struct LMS7Parameter PD_SDM_CGEN;
+extern const struct LMS7Parameter PD_VCO_CGEN;
+extern const struct LMS7Parameter PD_VCO_COMP_CGEN;
+extern const struct LMS7Parameter EN_G_CGEN;
+extern const struct LMS7Parameter FRAC_SDM_CGEN_LSB;
+extern const struct LMS7Parameter INT_SDM_CGEN;
+extern const struct LMS7Parameter FRAC_SDM_CGEN_MSB;
+extern const struct LMS7Parameter REV_SDMCLK_CGEN;
+extern const struct LMS7Parameter SEL_SDMCLK_CGEN;
+extern const struct LMS7Parameter SX_DITHER_EN_CGEN;
+extern const struct LMS7Parameter CLKH_OV_CLKL_CGEN;
+extern const struct LMS7Parameter DIV_OUTCH_CGEN;
+extern const struct LMS7Parameter TST_CGEN;
+extern const struct LMS7Parameter REV_CLKDAC_CGEN;
+extern const struct LMS7Parameter CMPLO_CTRL_CGEN;
+extern const struct LMS7Parameter REV_CLKADC_CGEN;
+extern const struct LMS7Parameter REVPH_PFD_CGEN;
+extern const struct LMS7Parameter IOFFSET_CP_CGEN;
+extern const struct LMS7Parameter IPULSE_CP_CGEN;
+extern const struct LMS7Parameter ICT_VCO_CGEN;
+extern const struct LMS7Parameter CSW_VCO_CGEN;
+extern const struct LMS7Parameter COARSE_START_CGEN;
+extern const struct LMS7Parameter COARSE_STEPDONE_CGEN;
+extern const struct LMS7Parameter COARSEPLL_COMPO_CGEN;
+extern const struct LMS7Parameter VCO_CMPHO_CGEN;
+extern const struct LMS7Parameter VCO_CMPLO_CGEN;
+extern const struct LMS7Parameter CP2_CGEN;
+extern const struct LMS7Parameter CP3_CGEN;
+extern const struct LMS7Parameter CZ_CGEN;
+extern const struct LMS7Parameter EN_LDO_DIG;
+extern const struct LMS7Parameter EN_LDO_DIGGN;
+extern const struct LMS7Parameter EN_LDO_DIGSXR;
+extern const struct LMS7Parameter EN_LDO_DIGSXT;
+extern const struct LMS7Parameter EN_LDO_DIVGN;
+extern const struct LMS7Parameter EN_LDO_DIVSXR;
+extern const struct LMS7Parameter EN_LDO_DIVSXT;
+extern const struct LMS7Parameter EN_LDO_LNA12;
+extern const struct LMS7Parameter EN_LDO_LNA14;
+extern const struct LMS7Parameter EN_LDO_MXRFE;
+extern const struct LMS7Parameter EN_LDO_RBB;
+extern const struct LMS7Parameter EN_LDO_RXBUF;
+extern const struct LMS7Parameter EN_LDO_TBB;
+extern const struct LMS7Parameter EN_LDO_TIA12;
+extern const struct LMS7Parameter EN_LDO_TIA14;
+extern const struct LMS7Parameter EN_G_LDO;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TLOB;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TPAD;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TXBUF;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_VCOGN;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_VCOSXR;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_VCOSXT;
+extern const struct LMS7Parameter EN_LDO_AFE;
+extern const struct LMS7Parameter EN_LDO_CPGN;
+extern const struct LMS7Parameter EN_LDO_CPSXR;
+extern const struct LMS7Parameter EN_LDO_TLOB;
+extern const struct LMS7Parameter EN_LDO_TPAD;
+extern const struct LMS7Parameter EN_LDO_TXBUF;
+extern const struct LMS7Parameter EN_LDO_VCOGN;
+extern const struct LMS7Parameter EN_LDO_VCOSXR;
+extern const struct LMS7Parameter EN_LDO_VCOSXT;
+extern const struct LMS7Parameter EN_LDO_CPSXT;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_CPSXT;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIG;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIGGN;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIGSXR;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIGSXT;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIVGN;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIVSXR;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIVSXT;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_LNA12;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_LNA14;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_MXRFE;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_RBB;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_RXBUF;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TBB;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TIA12;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_TIA14;
+extern const struct LMS7Parameter BYP_LDO_TBB;
+extern const struct LMS7Parameter BYP_LDO_TIA12;
+extern const struct LMS7Parameter BYP_LDO_TIA14;
+extern const struct LMS7Parameter BYP_LDO_TLOB;
+extern const struct LMS7Parameter BYP_LDO_TPAD;
+extern const struct LMS7Parameter BYP_LDO_TXBUF;
+extern const struct LMS7Parameter BYP_LDO_VCOGN;
+extern const struct LMS7Parameter BYP_LDO_VCOSXR;
+extern const struct LMS7Parameter BYP_LDO_VCOSXT;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_AFE;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_CPGN;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_CPSXR;
+extern const struct LMS7Parameter BYP_LDO_AFE;
+extern const struct LMS7Parameter BYP_LDO_CPGN;
+extern const struct LMS7Parameter BYP_LDO_CPSXR;
+extern const struct LMS7Parameter BYP_LDO_CPSXT;
+extern const struct LMS7Parameter BYP_LDO_DIG;
+extern const struct LMS7Parameter BYP_LDO_DIGGN;
+extern const struct LMS7Parameter BYP_LDO_DIGSXR;
+extern const struct LMS7Parameter BYP_LDO_DIGSXT;
+extern const struct LMS7Parameter BYP_LDO_DIVGN;
+extern const struct LMS7Parameter BYP_LDO_DIVSXR;
+extern const struct LMS7Parameter BYP_LDO_DIVSXT;
+extern const struct LMS7Parameter BYP_LDO_LNA12;
+extern const struct LMS7Parameter BYP_LDO_LNA14;
+extern const struct LMS7Parameter BYP_LDO_MXRFE;
+extern const struct LMS7Parameter BYP_LDO_RBB;
+extern const struct LMS7Parameter BYP_LDO_RXBUF;
+extern const struct LMS7Parameter SPDUP_LDO_DIVSXR;
+extern const struct LMS7Parameter SPDUP_LDO_DIVSXT;
+extern const struct LMS7Parameter SPDUP_LDO_LNA12;
+extern const struct LMS7Parameter SPDUP_LDO_LNA14;
+extern const struct LMS7Parameter SPDUP_LDO_MXRFE;
+extern const struct LMS7Parameter SPDUP_LDO_RBB;
+extern const struct LMS7Parameter SPDUP_LDO_RXBUF;
+extern const struct LMS7Parameter SPDUP_LDO_TBB;
+extern const struct LMS7Parameter SPDUP_LDO_TIA12;
+extern const struct LMS7Parameter SPDUP_LDO_TIA14;
+extern const struct LMS7Parameter SPDUP_LDO_TLOB;
+extern const struct LMS7Parameter SPDUP_LDO_TPAD;
+extern const struct LMS7Parameter SPDUP_LDO_TXBUF;
+extern const struct LMS7Parameter SPDUP_LDO_VCOGN;
+extern const struct LMS7Parameter SPDUP_LDO_VCOSXR;
+extern const struct LMS7Parameter SPDUP_LDO_VCOSXT;
+extern const struct LMS7Parameter SPDUP_LDO_AFE;
+extern const struct LMS7Parameter SPDUP_LDO_CPGN;
+extern const struct LMS7Parameter SPDUP_LDO_CPSXR;
+extern const struct LMS7Parameter SPDUP_LDO_CPSXT;
+extern const struct LMS7Parameter SPDUP_LDO_DIG;
+extern const struct LMS7Parameter SPDUP_LDO_DIGGN;
+extern const struct LMS7Parameter SPDUP_LDO_DIGSXR;
+extern const struct LMS7Parameter SPDUP_LDO_DIGSXT;
+extern const struct LMS7Parameter SPDUP_LDO_DIVGN;
+extern const struct LMS7Parameter RDIV_VCOSXR;
+extern const struct LMS7Parameter RDIV_VCOSXT;
+extern const struct LMS7Parameter RDIV_TXBUF;
+extern const struct LMS7Parameter RDIV_VCOGN;
+extern const struct LMS7Parameter RDIV_TLOB;
+extern const struct LMS7Parameter RDIV_TPAD;
+extern const struct LMS7Parameter RDIV_TIA12;
+extern const struct LMS7Parameter RDIV_TIA14;
+extern const struct LMS7Parameter RDIV_RXBUF;
+extern const struct LMS7Parameter RDIV_TBB;
+extern const struct LMS7Parameter RDIV_MXRFE;
+extern const struct LMS7Parameter RDIV_RBB;
+extern const struct LMS7Parameter RDIV_LNA12;
+extern const struct LMS7Parameter RDIV_LNA14;
+extern const struct LMS7Parameter RDIV_DIVSXR;
+extern const struct LMS7Parameter RDIV_DIVSXT;
+extern const struct LMS7Parameter RDIV_DIGSXT;
+extern const struct LMS7Parameter RDIV_DIVGN;
+extern const struct LMS7Parameter RDIV_DIGGN;
+extern const struct LMS7Parameter RDIV_DIGSXR;
+extern const struct LMS7Parameter RDIV_CPSXT;
+extern const struct LMS7Parameter RDIV_DIG;
+extern const struct LMS7Parameter RDIV_CPGN;
+extern const struct LMS7Parameter RDIV_CPSXR;
+extern const struct LMS7Parameter RDIV_SPIBUF;
+extern const struct LMS7Parameter RDIV_AFE;
+extern const struct LMS7Parameter SPDUP_LDO_SPIBUF;
+extern const struct LMS7Parameter SPDUP_LDO_DIGIp2;
+extern const struct LMS7Parameter SPDUP_LDO_DIGIp1;
+extern const struct LMS7Parameter BYP_LDO_SPIBUF;
+extern const struct LMS7Parameter BYP_LDO_DIGIp2;
+extern const struct LMS7Parameter BYP_LDO_DIGIp1;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_SPIBUF;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIGIp2;
+extern const struct LMS7Parameter EN_LOADIMP_LDO_DIGIp1;
+extern const struct LMS7Parameter PD_LDO_SPIBUF;
+extern const struct LMS7Parameter PD_LDO_DIGIp2;
+extern const struct LMS7Parameter PD_LDO_DIGIp1;
+extern const struct LMS7Parameter EN_G_LDOP;
+extern const struct LMS7Parameter RDIV_DIGIp2;
+extern const struct LMS7Parameter RDIV_DIGIp1;
+extern const struct LMS7Parameter BSIGT;
+extern const struct LMS7Parameter BSTATE;
+extern const struct LMS7Parameter EN_SDM_TSTO_SXT;
+extern const struct LMS7Parameter EN_SDM_TSTO_SXR;
+extern const struct LMS7Parameter EN_SDM_TSTO_CGEN;
+extern const struct LMS7Parameter BENC;
+extern const struct LMS7Parameter BENR;
+extern const struct LMS7Parameter BENT;
+extern const struct LMS7Parameter BSTART;
+extern const struct LMS7Parameter BSIGR;
+extern const struct LMS7Parameter BSIGC;
+extern const struct LMS7Parameter CDS_MCLK2;
+extern const struct LMS7Parameter CDS_MCLK1;
+extern const struct LMS7Parameter CDSN_TXBTSP;
+extern const struct LMS7Parameter CDSN_TXATSP;
+extern const struct LMS7Parameter CDSN_RXBTSP;
+extern const struct LMS7Parameter CDSN_RXATSP;
+extern const struct LMS7Parameter CDSN_TXBLML;
+extern const struct LMS7Parameter CDSN_TXALML;
+extern const struct LMS7Parameter CDSN_RXBLML;
+extern const struct LMS7Parameter CDSN_RXALML;
+extern const struct LMS7Parameter CDSN_MCLK2;
+extern const struct LMS7Parameter CDSN_MCLK1;
+extern const struct LMS7Parameter CDS_TXBTSP;
+extern const struct LMS7Parameter CDS_TXATSP;
+extern const struct LMS7Parameter CDS_RXBTSP;
+extern const struct LMS7Parameter CDS_RXATSP;
+extern const struct LMS7Parameter CDS_TXBLML;
+extern const struct LMS7Parameter CDS_TXALML;
+extern const struct LMS7Parameter CDS_RXBLML;
+extern const struct LMS7Parameter CDS_RXALML;
+extern const struct LMS7Parameter EN_LOWBWLOMX_TMX_TRF;
+extern const struct LMS7Parameter EN_NEXTTX_TRF;
+extern const struct LMS7Parameter EN_AMPHF_PDET_TRF;
+extern const struct LMS7Parameter LOADR_PDET_TRF;
+extern const struct LMS7Parameter PD_PDET_TRF;
+extern const struct LMS7Parameter PD_TLOBUF_TRF;
+extern const struct LMS7Parameter PD_TXPAD_TRF;
+extern const struct LMS7Parameter EN_G_TRF;
+extern const struct LMS7Parameter F_TXPAD_TRF;
+extern const struct LMS7Parameter L_LOOPB_TXPAD_TRF;
+extern const struct LMS7Parameter LOSS_LIN_TXPAD_TRF;
+extern const struct LMS7Parameter LOSS_MAIN_TXPAD_TRF;
+extern const struct LMS7Parameter EN_LOOPB_TXPAD_TRF;
+extern const struct LMS7Parameter GCAS_GNDREF_TXPAD_TRF;
+extern const struct LMS7Parameter ICT_LIN_TXPAD_TRF;
+extern const struct LMS7Parameter ICT_MAIN_TXPAD_TRF;
+extern const struct LMS7Parameter VGCAS_TXPAD_TRF;
+extern const struct LMS7Parameter SEL_BAND1_TRF;
+extern const struct LMS7Parameter SEL_BAND2_TRF;
+extern const struct LMS7Parameter LOBIASN_TXM_TRF;
+extern const struct LMS7Parameter LOBIASP_TXX_TRF;
+extern const struct LMS7Parameter CDC_I_TRF;
+extern const struct LMS7Parameter CDC_Q_TRF;
+extern const struct LMS7Parameter STATPULSE_TBB;
+extern const struct LMS7Parameter LOOPB_TBB;
+extern const struct LMS7Parameter PD_LPFH_TBB;
+extern const struct LMS7Parameter PD_LPFIAMP_TBB;
+extern const struct LMS7Parameter PD_LPFLAD_TBB;
+extern const struct LMS7Parameter PD_LPFS5_TBB;
+extern const struct LMS7Parameter EN_G_TBB;
+extern const struct LMS7Parameter ICT_LPFS5_F_TBB;
+extern const struct LMS7Parameter ICT_LPFS5_PT_TBB;
+extern const struct LMS7Parameter ICT_LPF_H_PT_TBB;
+extern const struct LMS7Parameter ICT_LPFH_F_TBB;
+extern const struct LMS7Parameter ICT_LPFLAD_F_TBB;
+extern const struct LMS7Parameter ICT_LPFLAD_PT_TBB;
+extern const struct LMS7Parameter CG_IAMP_TBB;
+extern const struct LMS7Parameter ICT_IAMP_FRP_TBB;
+extern const struct LMS7Parameter ICT_IAMP_GG_FRP_TBB;
+extern const struct LMS7Parameter RCAL_LPFH_TBB;
+extern const struct LMS7Parameter RCAL_LPFLAD_TBB;
+extern const struct LMS7Parameter TSTIN_TBB;
+extern const struct LMS7Parameter BYPLADDER_TBB;
+extern const struct LMS7Parameter CCAL_LPFLAD_TBB;
+extern const struct LMS7Parameter RCAL_LPFS5_TBB;
+extern const struct LMS7Parameter CDC_I_RFE;
+extern const struct LMS7Parameter CDC_Q_RFE;
+extern const struct LMS7Parameter PD_LNA_RFE;
+extern const struct LMS7Parameter PD_RLOOPB_1_RFE;
+extern const struct LMS7Parameter PD_RLOOPB_2_RFE;
+extern const struct LMS7Parameter PD_MXLOBUF_RFE;
+extern const struct LMS7Parameter PD_QGEN_RFE;
+extern const struct LMS7Parameter PD_RSSI_RFE;
+extern const struct LMS7Parameter PD_TIA_RFE;
+extern const struct LMS7Parameter EN_G_RFE;
+extern const struct LMS7Parameter SEL_PATH_RFE;
+extern const struct LMS7Parameter EN_DCOFF_RXFE_RFE;
+extern const struct LMS7Parameter EN_INSHSW_LB1_RFE;
+extern const struct LMS7Parameter EN_INSHSW_LB2_RFE;
+extern const struct LMS7Parameter EN_INSHSW_L_RFE;
+extern const struct LMS7Parameter EN_INSHSW_W_RFE;
+extern const struct LMS7Parameter EN_NEXTRX_RFE;
+extern const struct LMS7Parameter DCOFFI_RFE;
+extern const struct LMS7Parameter DCOFFQ_RFE;
+extern const struct LMS7Parameter ICT_LOOPB_RFE;
+extern const struct LMS7Parameter ICT_TIAMAIN_RFE;
+extern const struct LMS7Parameter ICT_TIAOUT_RFE;
+extern const struct LMS7Parameter ICT_LNACMO_RFE;
+extern const struct LMS7Parameter ICT_LNA_RFE;
+extern const struct LMS7Parameter ICT_LODC_RFE;
+extern const struct LMS7Parameter CAP_RXMXO_RFE;
+extern const struct LMS7Parameter CGSIN_LNA_RFE;
+extern const struct LMS7Parameter CCOMP_TIA_RFE;
+extern const struct LMS7Parameter CFB_TIA_RFE;
+extern const struct LMS7Parameter G_LNA_RFE;
+extern const struct LMS7Parameter G_RXLOOPB_RFE;
+extern const struct LMS7Parameter G_TIA_RFE;
+extern const struct LMS7Parameter RCOMP_TIA_RFE;
+extern const struct LMS7Parameter RFB_TIA_RFE;
+extern const struct LMS7Parameter EN_LB_LPFH_RBB;
+extern const struct LMS7Parameter EN_LB_LPFL_RBB;
+extern const struct LMS7Parameter PD_LPFH_RBB;
+extern const struct LMS7Parameter PD_LPFL_RBB;
+extern const struct LMS7Parameter PD_PGA_RBB;
+extern const struct LMS7Parameter EN_G_RBB;
+extern const struct LMS7Parameter R_CTL_LPF_RBB;
+extern const struct LMS7Parameter RCC_CTL_LPFH_RBB;
+extern const struct LMS7Parameter C_CTL_LPFH_RBB;
+extern const struct LMS7Parameter RCC_CTL_LPFL_RBB;
+extern const struct LMS7Parameter C_CTL_LPFL_RBB;
+extern const struct LMS7Parameter INPUT_CTL_PGA_RBB;
+extern const struct LMS7Parameter ICT_LPF_IN_RBB;
+extern const struct LMS7Parameter ICT_LPF_OUT_RBB;
+extern const struct LMS7Parameter OSW_PGA_RBB;
+extern const struct LMS7Parameter ICT_PGA_OUT_RBB;
+extern const struct LMS7Parameter ICT_PGA_IN_RBB;
+extern const struct LMS7Parameter G_PGA_RBB;
+extern const struct LMS7Parameter RCC_CTL_PGA_RBB;
+extern const struct LMS7Parameter C_CTL_PGA_RBB;
+extern const struct LMS7Parameter RESET_N;
+extern const struct LMS7Parameter SPDUP_VCO;
+extern const struct LMS7Parameter BYPLDO_VCO;
+extern const struct LMS7Parameter EN_COARSEPLL;
+extern const struct LMS7Parameter CURLIM_VCO;
+extern const struct LMS7Parameter EN_DIV2_DIVPROG;
+extern const struct LMS7Parameter EN_INTONLY_SDM;
+extern const struct LMS7Parameter EN_SDM_CLK;
+extern const struct LMS7Parameter PD_FBDIV;
+extern const struct LMS7Parameter PD_LOCH_T2RBUF;
+extern const struct LMS7Parameter PD_CP;
+extern const struct LMS7Parameter PD_FDIV;
+extern const struct LMS7Parameter PD_SDM;
+extern const struct LMS7Parameter PD_VCO_COMP;
+extern const struct LMS7Parameter PD_VCO;
+extern const struct LMS7Parameter EN_G;
+extern const struct LMS7Parameter FRAC_SDM_LSB;
+extern const struct LMS7Parameter INT_SDM;
+extern const struct LMS7Parameter FRAC_SDM_MSB;
+extern const struct LMS7Parameter PW_DIV2_LOCH;
+extern const struct LMS7Parameter PW_DIV4_LOCH;
+extern const struct LMS7Parameter DIV_LOCH;
+extern const struct LMS7Parameter TST_SX;
+extern const struct LMS7Parameter SEL_SDMCLK;
+extern const struct LMS7Parameter SX_DITHER_EN;
+extern const struct LMS7Parameter REV_SDMCLK;
+extern const struct LMS7Parameter VDIV_VCO;
+extern const struct LMS7Parameter ICT_VCO;
+extern const struct LMS7Parameter RSEL_LDO_VCO;
+extern const struct LMS7Parameter CSW_VCO;
+extern const struct LMS7Parameter SEL_VCO;
+extern const struct LMS7Parameter COARSE_START;
+extern const struct LMS7Parameter REVPH_PFD;
+extern const struct LMS7Parameter IOFFSET_CP;
+extern const struct LMS7Parameter IPULSE_CP;
+extern const struct LMS7Parameter COARSE_STEPDONE;
+extern const struct LMS7Parameter COARSEPLL_COMPO;
+extern const struct LMS7Parameter VCO_CMPHO;
+extern const struct LMS7Parameter VCO_CMPLO;
+extern const struct LMS7Parameter CP2_PLL;
+extern const struct LMS7Parameter CP3_PLL;
+extern const struct LMS7Parameter CZ;
+extern const struct LMS7Parameter EN_DIR_SXRSXT;
+extern const struct LMS7Parameter EN_DIR_RBB;
+extern const struct LMS7Parameter EN_DIR_RFE;
+extern const struct LMS7Parameter EN_DIR_TBB;
+extern const struct LMS7Parameter EN_DIR_TRF;
+extern const struct LMS7Parameter TSGFC_TXTSP;
+extern const struct LMS7Parameter TSGFCW_TXTSP;
+extern const struct LMS7Parameter TSGDCLDQ_TXTSP;
+extern const struct LMS7Parameter TSGDCLDI_TXTSP;
+extern const struct LMS7Parameter TSGSWAPIQ_TXTSP;
+extern const struct LMS7Parameter TSGMODE_TXTSP;
+extern const struct LMS7Parameter INSEL_TXTSP;
+extern const struct LMS7Parameter BSTART_TXTSP;
+extern const struct LMS7Parameter EN_TXTSP;
+extern const struct LMS7Parameter GCORRQ_TXTSP;
+extern const struct LMS7Parameter GCORRI_TXTSP;
+extern const struct LMS7Parameter HBI_OVR_TXTSP;
+extern const struct LMS7Parameter IQCORR_TXTSP;
+extern const struct LMS7Parameter DCCORRI_TXTSP;
+extern const struct LMS7Parameter DCCORRQ_TXTSP;
+extern const struct LMS7Parameter GFIR1_L_TXTSP;
+extern const struct LMS7Parameter GFIR1_N_TXTSP;
+extern const struct LMS7Parameter GFIR2_L_TXTSP;
+extern const struct LMS7Parameter GFIR2_N_TXTSP;
+extern const struct LMS7Parameter GFIR3_L_TXTSP;
+extern const struct LMS7Parameter GFIR3_N_TXTSP;
+extern const struct LMS7Parameter CMIX_GAIN_TXTSP;
+extern const struct LMS7Parameter CMIX_SC_TXTSP;
+extern const struct LMS7Parameter CMIX_BYP_TXTSP;
+extern const struct LMS7Parameter ISINC_BYP_TXTSP;
+extern const struct LMS7Parameter GFIR3_BYP_TXTSP;
+extern const struct LMS7Parameter GFIR2_BYP_TXTSP;
+extern const struct LMS7Parameter GFIR1_BYP_TXTSP;
+extern const struct LMS7Parameter DC_BYP_TXTSP;
+extern const struct LMS7Parameter GC_BYP_TXTSP;
+extern const struct LMS7Parameter PH_BYP_TXTSP;
+extern const struct LMS7Parameter BSIGI_TXTSP;
+extern const struct LMS7Parameter BSTATE_TXTSP;
+extern const struct LMS7Parameter BSIGQ_TXTSP;
+extern const struct LMS7Parameter DC_REG_TXTSP;
+extern const struct LMS7Parameter DTHBIT_TX;
+extern const struct LMS7Parameter SEL_TX;
+extern const struct LMS7Parameter MODE_TX;
+extern const struct LMS7Parameter CAPTURE;
+extern const struct LMS7Parameter CAPSEL;
+extern const struct LMS7Parameter CAPSEL_ADC;
+extern const struct LMS7Parameter TSGFC_RXTSP;
+extern const struct LMS7Parameter TSGFCW_RXTSP;
+extern const struct LMS7Parameter TSGDCLDQ_RXTSP;
+extern const struct LMS7Parameter TSGDCLDI_RXTSP;
+extern const struct LMS7Parameter TSGSWAPIQ_RXTSP;
+extern const struct LMS7Parameter TSGMODE_RXTSP;
+extern const struct LMS7Parameter INSEL_RXTSP;
+extern const struct LMS7Parameter BSTART_RXTSP;
+extern const struct LMS7Parameter EN_RXTSP;
+extern const struct LMS7Parameter GCORRQ_RXTSP;
+extern const struct LMS7Parameter GCORRI_RXTSP;
+extern const struct LMS7Parameter HBD_OVR_RXTSP;
+extern const struct LMS7Parameter IQCORR_RXTSP;
+extern const struct LMS7Parameter HBD_DLY;
+extern const struct LMS7Parameter DCLOOP_BYP;
+extern const struct LMS7Parameter DCCORR_AVG_RXTSP;
+extern const struct LMS7Parameter GFIR1_L_RXTSP;
+extern const struct LMS7Parameter GFIR1_N_RXTSP;
+extern const struct LMS7Parameter GFIR2_L_RXTSP;
+extern const struct LMS7Parameter GFIR2_N_RXTSP;
+extern const struct LMS7Parameter GFIR3_L_RXTSP;
+extern const struct LMS7Parameter GFIR3_N_RXTSP;
+extern const struct LMS7Parameter AGC_K_RXTSP;
+extern const struct LMS7Parameter AGC_ADESIRED_RXTSP;
+extern const struct LMS7Parameter RSSI_MODE;
+extern const struct LMS7Parameter AGC_MODE_RXTSP;
+extern const struct LMS7Parameter AGC_AVG_RXTSP;
+extern const struct LMS7Parameter DC_REG_RXTSP;
+extern const struct LMS7Parameter CMIX_GAIN_RXTSP;
+extern const struct LMS7Parameter CMIX_SC_RXTSP;
+extern const struct LMS7Parameter CMIX_BYP_RXTSP;
+extern const struct LMS7Parameter AGC_BYP_RXTSP;
+extern const struct LMS7Parameter GFIR3_BYP_RXTSP;
+extern const struct LMS7Parameter GFIR2_BYP_RXTSP;
+extern const struct LMS7Parameter GFIR1_BYP_RXTSP;
+extern const struct LMS7Parameter DC_BYP_RXTSP;
+extern const struct LMS7Parameter GC_BYP_RXTSP;
+extern const struct LMS7Parameter PH_BYP_RXTSP;
+extern const struct LMS7Parameter CAPD;
+extern const struct LMS7Parameter DTHBIT_RX;
+extern const struct LMS7Parameter SEL_RX;
+extern const struct LMS7Parameter MODE_RX;
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4e00854e1443956870826ab0830dbed0c9a52498
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.cpp
@@ -0,0 +1,16 @@
+/**
+@file	LMS7002M_statuses.cpp
+@author Lime Microsystems (www.limemicro.com)
+*/
+
+#include "LMS7002M_statuses.h"
+
+const char* undefinedStatusStr = "undefined status";
+
+const char* liblms7_status2string(liblms7_status status)
+{
+    if (status >= 0 && status < LIBLMS7_STATUS_COUNT)
+        return liblms7_status_strings[status];
+    else
+        return undefinedStatusStr;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.h
new file mode 100644
index 0000000000000000000000000000000000000000..43b736bfd52f541581742a703ba2010356ec6ce4
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/LMS7002M_statuses.h
@@ -0,0 +1,48 @@
+/**
+@file	LMS7002M_statuses.h
+@author Lime Microsystems (www.limemicro.com)
+@brief 	LMS7002M control library statuses enumerations
+*/
+
+#ifndef LMS7API_STATUSES_H
+#define LMS7API_STATUSES_H
+
+const char liblms7_status_strings[][64] =
+{
+"success",
+"failure",
+"index out of range",
+"too many values",
+"connection manager is NULL",
+"port not connected",
+"frequency out of range",
+"cannot deliver frequency",
+"VCO is powered down",
+"Bad SEL_PATH_RFE",
+"Band not selected",
+"file not found",
+"file invalid format",
+};
+
+enum liblms7_status
+{
+	LIBLMS7_SUCCESS = 0,
+	LIBLMS7_FAILURE,
+	LIBLMS7_INDEX_OUT_OF_RANGE,
+    LIBLMS7_TOO_MANY_VALUES,
+    LIBLMS7_NO_CONNECTION_MANAGER,
+    LIBLMS7_NOT_CONNECTED,
+    LIBLMS7_FREQUENCY_OUT_OF_RANGE,    
+    LIBLMS7_CANNOT_DELIVER_FREQUENCY,
+    LIBLMS7_VCO_IS_POWERED_DOWN,
+    LIBLMS7_BAD_SEL_PATH,
+    LIBLMS7_BAND_NOT_SELECTED,
+    LIBLMS7_FILE_NOT_FOUND,
+    LIBLMS7_FILE_INVALID_FORMAT,
+
+    LIBLMS7_STATUS_COUNT
+};
+
+const char* liblms7_status2string(liblms7_status status);
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6c7fc0d8290d5c26a8ae575fbcc98b4058cae124
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.cpp
@@ -0,0 +1,596 @@
+/**
+    @file   ConnectionCOM.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief  Implementation of communications through COM port
+*/
+
+#include "ConnectionCOM.h"
+
+#include "string.h"
+#ifdef __unix__
+#include <fstream>
+#include <errno.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <iostream>
+#include <stdio.h>
+#endif // LINUX
+
+const int COM_RETRY_INTERVAL = 20; //ms
+const int COM_TOTAL_TIMEOUT = 300; //ms
+
+/** @brief Initializes com port connection
+*/
+ConnectionCOM::ConnectionCOM()
+{
+    currentDeviceIndex = -1;
+	connected = false;
+	comPortList.clear();
+	m_deviceNames.clear();
+	m_connectionType = COM_PORT;
+#ifndef __unix__
+	hComm = INVALID_HANDLE_VALUE;
+#else
+    hComm = -1;
+#endif
+	comBaudrate = 9600;
+}
+
+/** @brief When object is destroyed it closes it's opened COM port
+*/
+ConnectionCOM::~ConnectionCOM()
+{
+	Close();
+}
+
+/** @brief Opens connection to first found chip
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open()
+{
+	comPortList.clear();
+	if(comPortList.size() == 0)
+		FindAllComPorts();
+
+	m_deviceNames.clear();
+	if(m_deviceNames.size() == 0)
+		RefreshDeviceList();
+
+	for(unsigned int i=0; i<m_deviceNames.size(); i++)
+	{
+		if( Open(i) == SUCCESS)
+		{
+			currentDeviceIndex = i;
+			return SUCCESS;
+		}
+	}
+	return FAILURE;
+}
+
+/** @brief Opens connection to selected chip
+    @param index chip index in device list
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open(unsigned index)
+{
+    unsigned int toOpen = index;
+	Close();
+	if(toOpen < m_deviceNames.size() && m_deviceNames.size() > 0 )
+	{
+		comPortName = m_deviceNames[toOpen];
+		IConnection::DeviceStatus status = Open(comPortName.c_str(), comBaudrate);
+		if( status == SUCCESS )
+			currentDeviceIndex = toOpen;
+        return status;
+	}
+	return FAILURE;
+}
+
+/** @brief Closes connection to chip
+*/
+void ConnectionCOM::Close()
+{
+    connected = false;
+    currentDeviceIndex = -1;
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE)
+	{
+		SetCommTimeouts(hComm, &m_ctmoOld);
+		CloseHandle(hComm);
+	}
+	hComm = INVALID_HANDLE_VALUE;
+#else
+    if( hComm >= 0)
+    {
+        close(hComm);
+    }
+    hComm = -1;
+#endif
+}
+
+/** @brief Returns whether chip is connected
+    @return chip is connected
+*/
+bool ConnectionCOM::IsOpen()
+{
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE && TestConnectivity() )
+		return true;
+#else
+    if( hComm != -1 && TestConnectivity() )
+        return true;
+#endif
+    return false;
+}
+
+int ConnectionCOM::GetOpenedIndex()
+{
+    return currentDeviceIndex;
+}
+
+/** @brief Sends data through COM port
+    @param buffer data buffer to send
+    @param length size of data buffer
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes sent
+*/
+int ConnectionCOM::Write(const unsigned char *buffer, int length, int timeout_ms)
+{
+    if(timeout_ms == 0)
+    {
+        timeout_ms = COM_TOTAL_TIMEOUT;
+    }
+    int retryCount = 0;
+    const int maxRetries = (timeout_ms/COM_RETRY_INTERVAL) > 1 ? (timeout_ms/COM_RETRY_INTERVAL) : 1;
+    bool status = false;
+#ifndef __unix__
+	unsigned long bytesWriten = 0;
+	m_osWOverlap.InternalHigh = 0;
+
+	for(int i = 0; i<maxRetries && status == false; ++i)
+    {
+        if (!WriteFile(hComm, buffer, length , &bytesWriten, NULL))
+        {
+            status = false;
+        }
+        else
+            status = true;
+        ++retryCount;
+    }
+#else
+    long bytesWriten = 0;
+    for(int i = 0; i<maxRetries && bytesWriten == 0; ++i)
+    {
+        bytesWriten = write(hComm, buffer, length);
+        if(bytesWriten <= 0)
+        {
+//            if(bytesWriten < 0)
+//                MessageLog::getInstance()->write("COM PORT: error writing data\n", LOG_ERROR);
+//            if(bytesWriten == 0)
+//                MessageLog::getInstance()->write("COM PORT: data bytes sent 0\n", LOG_WARNING);
+            status = false;
+        }
+        else
+            status = true;
+        ++retryCount;
+    }
+#endif
+    if(bytesWriten == length)
+        status = true;
+
+	return bytesWriten;
+}
+
+/** @brief Reads data from COM port
+    @param buffer pointer to data buffer for receiving
+    @param length number of bytes to read
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes received
+*/
+int ConnectionCOM::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+    if(timeout_ms == 0)
+    {
+        timeout_ms = COM_TOTAL_TIMEOUT;
+    }
+    int retryCount = 0;
+    const int maxRetries = (timeout_ms/COM_RETRY_INTERVAL) > 1 ? (timeout_ms/COM_RETRY_INTERVAL) : 1;
+    bool status = false;
+
+    memset(buffer, 0, length);
+	long bytesReaded = 0;
+	unsigned long totalBytesReaded = 0;
+	char cRawData[COM_BUFFER_LENGTH];
+	unsigned long bytesToRead = length;
+
+	memset(cRawData, '\0', sizeof(cRawData[0])*COM_BUFFER_LENGTH);
+
+	for(int i=0; i<maxRetries && status == false; ++i)
+    {
+        memset(cRawData, '\0', sizeof(cRawData[0])*COM_BUFFER_LENGTH);
+#ifndef __unix__
+
+        DWORD bytesReceived = 0;
+        if ( !ReadFile(hComm, cRawData, bytesToRead, &bytesReceived, NULL) )
+        {
+            status = false;
+        }
+
+        bytesReaded = bytesReceived;
+#else
+        bytesReaded = read(hComm, cRawData, bytesToRead);
+        if(bytesReaded <= 0)
+        {
+//            if(bytesReaded < 0)
+//                MessageLog::getInstance()->write("COM PORT: error reading data\n", LOG_ERROR);
+//            if(bytesReaded == 0)
+//                MessageLog::getInstance()->write("COM PORT: reading 0 bytes\n", LOG_WARNING);
+            status = false;
+        }
+#endif
+        retryCount++;
+
+        for(int j=0; j<bytesReaded; ++j)
+        {
+            buffer[totalBytesReaded+j] = cRawData[j];
+        }
+
+        totalBytesReaded += bytesReaded;
+        if(totalBytesReaded == bytesToRead)
+            status = true;
+    }
+
+//    ss << " read(" << totalBytesReaded << "): ";
+//    for(unsigned int i=0; i<64; ++i)
+//        ss << int2hex(buffer[i], 1) << " ";
+//    ss <<  " - retries: " << retryCount-1 << endl;
+    //MessageLog::getInstance()->write(ss.str(), LOG_DATA);
+
+//	if(retryCount == maxRetries)
+//        MessageLog::getInstance()->write("COM PORT: read data timeout\n", LOG_WARNING);
+//
+//    if(totalBytesReaded > length)
+//        MessageLog::getInstance()->write("COM PORT: read data corrupted, received length > requested length\n", LOG_ERROR);
+	return totalBytesReaded;
+}
+
+/** @brief Searches for available COM ports and adds them to list
+*/
+void ConnectionCOM::FindAllComPorts()
+{
+    Close();
+	comPortList.clear();
+#ifndef __unix__
+	HKEY hSERIALCOMM;
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HARDWARE\\DEVICEMAP\\SERIALCOMM"),	0, KEY_QUERY_VALUE, &hSERIALCOMM) == ERROR_SUCCESS)
+	{
+		// Get the max value name and max value lengths
+		DWORD dwMaxValueNameLen;
+		DWORD dwMaxValueLen;
+		DWORD dwQueryInfo = RegQueryInfoKey(hSERIALCOMM, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &dwMaxValueNameLen, &dwMaxValueLen, NULL, NULL);
+		if (dwQueryInfo == ERROR_SUCCESS)
+		{
+			DWORD dwMaxValueNameSizeInChars = dwMaxValueNameLen + 1;
+			// Include space for the NULL terminator
+			DWORD dwMaxValueNameSizeInBytes = dwMaxValueNameSizeInChars*sizeof(TCHAR);
+			DWORD dwMaxValueDataSizeInChars = dwMaxValueLen / sizeof(TCHAR) + 1;
+			// Include space for the NULL terminator
+			DWORD dwMaxValueDataSizeInBytes = dwMaxValueDataSizeInChars*sizeof(TCHAR);
+
+			// Allocate some space for the value name and value data
+			TCHAR* szValueName = new TCHAR[dwMaxValueNameSizeInChars];
+			TCHAR* byValue = new TCHAR[dwMaxValueDataSizeInBytes];
+			if (szValueName && byValue)
+			{
+				// Enumerate all the values underneath HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\SERIALCOMM
+				DWORD dwIndex = 0;
+				DWORD dwType;
+				DWORD dwValueNameSize = dwMaxValueNameSizeInChars;
+				DWORD dwDataSize = dwMaxValueDataSizeInBytes;
+				memset(szValueName, 0, dwMaxValueNameSizeInBytes);
+				memset(byValue, 0, dwMaxValueDataSizeInBytes);
+				LONG nEnum = RegEnumValue(hSERIALCOMM, dwIndex, szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE)byValue, &dwDataSize);
+				while (nEnum == ERROR_SUCCESS)
+				{
+					// If the value is of the correct type, then add it to the array
+					if (dwType == REG_SZ)
+					{
+					    char portname[512];
+						TCHAR* szPort = byValue;
+						int nUserNameLenUnicode = lstrlen( szPort ); // Convert all UNICODE characters
+						int nUserNameLen = WideCharToMultiByte( CP_ACP, // ANSI Code Page
+                        0, // No special handling of unmapped chars
+                        (LPCWSTR)szPort, // wide-character string to be converted
+                        nUserNameLenUnicode,
+                        NULL, 0, // No output buffer since we are calculating length
+                        NULL, NULL ); // Unrepresented char replacement - Use Default
+                        TCHAR* pszUserName = new TCHAR[ nUserNameLen ]; // nUserNameLen includes the NULL character
+                        WideCharToMultiByte( CP_ACP, // ANSI Code Page
+                        0, // No special handling of unmapped chars
+						(LPCWSTR)szPort, // wide-character string to be converted
+                        nUserNameLenUnicode,
+                        portname,
+                        nUserNameLen,
+                        NULL, NULL ); // Unrepresented char replacement - Use Default
+						portname[nUserNameLen] = 0;
+#ifdef UNICODE
+                        comPortList.push_back(portname);
+#else
+                        comPortList.push_back(szPort);
+#endif
+					}
+					// Prepare for the next time around
+					dwValueNameSize = dwMaxValueNameSizeInChars;
+					dwDataSize = dwMaxValueDataSizeInBytes;
+					memset(szValueName, 0, dwMaxValueNameSizeInBytes);
+					memset(byValue, 0, dwMaxValueDataSizeInBytes);
+					++dwIndex;
+					nEnum = RegEnumValue(hSERIALCOMM, dwIndex, szValueName,	&dwValueNameSize, NULL, &dwType, (LPBYTE)byValue, &dwDataSize);
+				}
+			}
+			delete szValueName;
+			delete byValue;
+		}
+		// Close the registry key now that we are finished with it
+		RegCloseKey(hSERIALCOMM);
+
+		if (dwQueryInfo != ERROR_SUCCESS)
+			SetLastError(dwQueryInfo);
+	}
+#else
+    char tempBuffer[256];
+    string result = "";
+#warning Currently searching only for ACM connections
+    system( "ls /dev | grep ttyACM > /tmp/foundSerialPorts.txt");
+
+    fstream fin;
+    fin.open("/tmp/foundSerialPorts.txt", ios::in);
+    while(!fin.eof())
+    {
+        fin.getline(tempBuffer, 256);
+        result = "/dev/";
+        result.append(tempBuffer);
+        if( strlen(tempBuffer) > 3 ) //longer than tty
+            comPortList.push_back(result);
+    }
+    fin.close();
+#endif
+}
+
+/** @brief Opens COM port
+    @param comName COM port name
+    @param baudrate COM port baudrate
+    @return 0 on success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open(const char *comName, int baudrate)
+{
+	Close();
+	if (strlen(comName) == 0)
+		return FAILURE;
+
+	DeviceStatus errorCode = SUCCESS;
+
+#ifndef __unix__
+	// Initialize Overlap structures
+	m_osROverlap.Internal = 0;
+	m_osROverlap.InternalHigh = 0;
+	m_osROverlap.Offset = 0;
+	m_osROverlap.OffsetHigh = 0;
+	m_osROverlap.hEvent = CreateEvent(NULL, false, false, NULL);
+
+	m_osWOverlap.Internal = 0;
+	m_osWOverlap.InternalHigh = 0;
+	m_osWOverlap.Offset = 0;
+	m_osWOverlap.OffsetHigh = 0;
+	m_osWOverlap.hEvent = CreateEvent(NULL, false, false, NULL);
+
+	// Initialize DSB structure
+	memset(&m_dcbCommPort, 0, sizeof(m_dcbCommPort));
+
+	m_dcbCommPort.BaudRate = comBaudrate;
+	m_dcbCommPort.fBinary = 1;
+	m_dcbCommPort.fParity = 0;
+	m_dcbCommPort.fOutxCtsFlow = 0;
+	m_dcbCommPort.fOutxDsrFlow = 0;
+	m_dcbCommPort.fDtrControl = 0;
+	m_dcbCommPort.fDsrSensitivity = 0;
+	m_dcbCommPort.fTXContinueOnXoff = 0;
+	m_dcbCommPort.fOutX = 0;
+	m_dcbCommPort.fInX = 0;
+	m_dcbCommPort.fErrorChar = 0;
+	m_dcbCommPort.fNull = 0;
+	m_dcbCommPort.fRtsControl = 0;
+	m_dcbCommPort.fAbortOnError = 0;
+	m_dcbCommPort.fDummy2 = 0;
+	// m_dcbCommPort.wReserved = 0;
+	m_dcbCommPort.XonLim = 512;
+	m_dcbCommPort.XoffLim = 512;
+	m_dcbCommPort.ByteSize = 8;
+	m_dcbCommPort.Parity = 0;
+	m_dcbCommPort.StopBits = 0;
+	//m_dcbCommPort.StopBits = 1;
+	m_dcbCommPort.XonChar = 17;
+	m_dcbCommPort.XoffChar = 19;
+	m_dcbCommPort.ErrorChar = 0;
+	m_dcbCommPort.EofChar = 26;
+	m_dcbCommPort.EvtChar = 0;
+	m_dcbCommPort.wReserved1 = 0;
+	m_dcbCommPort.DCBlength = sizeof(DCB);
+
+	// Initialize Timeout's
+	m_ctmoNew.ReadIntervalTimeout = 50;
+	m_ctmoNew.ReadTotalTimeoutMultiplier = 0;
+	m_ctmoNew.ReadTotalTimeoutConstant = 100; // 1;
+	m_ctmoNew.WriteTotalTimeoutMultiplier = 0;
+	m_ctmoNew.WriteTotalTimeoutConstant = 100;
+
+	// Open COM port
+	string stmp;
+	stmp = "\\\\.\\";
+	stmp.append(comName);
+	hComm = CreateFileA(stmp.c_str(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+	if (hComm != INVALID_HANDLE_VALUE)
+	{
+		// Set Events
+		if (!SetCommMask(hComm, 0))
+			errorCode = FAILURE;
+
+		// Set Timeouts
+		GetCommTimeouts(hComm, &m_ctmoOld);
+		if (!SetCommTimeouts(hComm, &m_ctmoNew))
+			errorCode = FAILURE;
+
+		// Set DCB
+		if (!SetCommState(hComm, &m_dcbCommPort))
+			errorCode = FAILURE;
+	}
+	else
+	{
+		errorCode = FAILURE;
+	};
+
+	// Check the results
+	if (errorCode != 0)
+	{
+		//unsigned long err = GetLastError();
+		CloseHandle(hComm);
+		hComm = INVALID_HANDLE_VALUE;
+		return errorCode;
+	}
+	else
+	{
+		PurgeComm(hComm, PURGE_TXCLEAR | PURGE_RXCLEAR);
+		return SUCCESS;
+	}
+#else
+    hComm = open(comName, O_RDWR | O_NOCTTY | O_SYNC);
+    if(hComm < 0)
+    {
+//        printf("%s",strerror(errno));
+//        MessageLog::getInstance()->write("Connection manager: failed opening COM port\n", LOG_ERROR);
+        return FAILURE;
+    }
+
+    struct termios tty;
+    memset(&tty, 0, sizeof(tty));
+    if( tcgetattr(hComm, &tty) != 0)
+    {
+//        MessageLog::getInstance()->write("Connection Manager: error from tcgetattr\n", LOG_ERROR);
+        return FAILURE;
+    }
+    int speed = B9600;
+    cfsetospeed(&tty, speed);
+    cfsetispeed(&tty, speed);
+
+    tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;
+    tty.c_iflag &= ~IGNBRK;
+    tty.c_lflag = 0;
+    tty.c_oflag = 0;
+    tty.c_cc[VMIN] = 0; // read non blocking
+    tty.c_cc[VTIME] = 5; // 0.5 seconds read timeout
+
+    tty.c_iflag &= ~(IXON | IXOFF | IXANY);
+    tty.c_cflag |= (CLOCAL | CREAD);
+
+    if(tcsetattr(hComm, TCSANOW, &tty) != 0)
+    {
+//        MessageLog::getInstance()->write("Connection manager: error from tcsetattr\n", LOG_ERROR);
+        return FAILURE;
+    }
+#endif
+    return SUCCESS;
+}
+
+/** @brief Checks if chip is connected to currently open port
+    @return chip is connected
+*/
+bool ConnectionCOM::TestConnectivity()
+{
+//currently set to always return true to show all com ports
+    return true;
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE)
+#else
+    if( hComm >= 0)
+#endif
+	{
+//	    unsigned char out[64];
+//	    unsigned char in[64];
+//	    memset(in, 0, 64);
+//	    out[0] = CMD_GET_INFO;
+//        SendData(out, 64);
+//        ReadData(in, 64);
+//        if(in[0] == CMD_GET_INFO && in[1] == 0x01)
+//            return true;
+//        else
+//            return false;
+	}
+	return false;
+}
+
+/** @brief Finds all chips connected to com ports
+    @return number of devices found
+*/
+int ConnectionCOM::RefreshDeviceList()
+{
+    int wasOpen = -1;
+    string wasOpenName = "";
+    if(IsOpen())
+    {
+        wasOpen = GetOpenedIndex();
+        wasOpenName = comPortName;
+    }
+    Close();
+    comPortList.clear();
+	if(comPortList.size() == 0)
+		FindAllComPorts();
+
+	m_deviceNames.clear();
+	string comName;
+	for(unsigned int i=0; i<comPortList.size(); i++)
+	{
+	    comName = comPortList[i];
+#ifndef __unix__
+		if( Open(comName.c_str(), comBaudrate) == SUCCESS)
+		{
+			if( TestConnectivity() ) //if responds add it to device list
+				m_deviceNames.push_back(comName);
+		}
+		Close();
+#else
+        m_deviceNames.push_back(comName);
+#endif
+	}
+	if(wasOpen != -1)
+    {
+        for(unsigned i=0; i<m_deviceNames.size(); ++i)
+            if(m_deviceNames[i] == wasOpenName)
+            {
+                Open(i);
+                break;
+            }
+    }
+	return m_deviceNames.size();
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionCOM::GetDeviceNames()
+{
+    return m_deviceNames;
+}
+
+/** @brief Purges communication buffers
+*/
+void ConnectionCOM::ClearComm()
+{
+#ifndef __unix__
+    PurgeComm(hComm, PURGE_TXCLEAR|PURGE_RXCLEAR);
+#endif
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.h
new file mode 100644
index 0000000000000000000000000000000000000000..0549472db1b9efb7312d75f906b3c7614e1455a7
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionCOM.h
@@ -0,0 +1,62 @@
+/**
+@file   ConnectionCOM.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data communications through COM port
+*/
+
+#ifndef CONNECTION_COM_PORT_H
+#define CONNECTION_COM_PORT_H
+
+#ifndef __unix__
+	#include "windows.h"
+#endif
+
+#include "IConnection.h"
+
+class ConnectionCOM : public IConnection
+{
+public:
+    static const int COM_BUFFER_LENGTH = 1024; //max buffer size for data
+
+	ConnectionCOM();
+	~ConnectionCOM();
+
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned i);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+	void ClearComm();
+private:
+	void FindAllComPorts();
+	DeviceStatus Open(const char *comName, int baudrate);
+
+	bool TestConnectivity();
+
+	std::string comPortName;
+	int comBaudrate;
+	bool connected;
+
+	int currentDeviceIndex;
+	std::vector<std::string> comPortList;
+	std::vector<std::string> m_deviceNames;
+
+#ifndef __unix__
+	HANDLE hComm;
+	COMMTIMEOUTS m_ctmoNew;
+	COMMTIMEOUTS m_ctmoOld;
+	OVERLAPPED m_osROverlap;
+	OVERLAPPED m_osWOverlap;
+	DCB m_dcbCommPort;
+#else
+    int hComm; //com port file descriptor
+#endif
+
+};
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..36f73da5d75af7f5ff15ceb64b6164fdcd5a8a1d
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.cpp
@@ -0,0 +1,314 @@
+/**
+    @file ConnectionManager.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief Implementation of various connection types to devices
+*/
+
+#include "ConnectionManager.h"
+#include "ConnectionCOM.h"
+
+#ifdef ENABLE_USB_CONNECTION
+    #include "ConnectionUSB.h"
+#endif
+#ifdef ENABLE_SPI_CONNECTION
+    #include "ConnectionSPI.h"
+#endif
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+
+/** @brief Creates connection interfaces
+*/
+ConnectionManager::ConnectionManager() : activeControlPort(NULL)
+{
+    mLogData = false;
+    mOpenedDevice = -1;
+    m_connections[IConnection::COM_PORT] = new ConnectionCOM();
+#ifdef ENABLE_USB_CONNECTION
+    m_connections[IConnection::USB_PORT] = new ConnectionUSB();
+#endif
+#ifdef ENABLE_SPI_CONNECTION
+    m_connections[IConnection::SPI_PORT] = new ConnectionSPI();
+#endif
+}
+
+/** @brief Destroys connection interfaces
+*/
+ConnectionManager::~ConnectionManager()
+{
+	for (auto iter = m_connections.begin(); iter != m_connections.end(); ++iter)
+	{
+		delete iter->second;
+	}
+}
+
+/** @brief Checks if connection to device is opened
+    @return True if device is connected
+*/
+bool ConnectionManager::IsOpen()
+{
+    return activeControlPort ? activeControlPort->IsOpen() : false;
+}
+
+/** @brief Opens connection to first available device
+    @return True if connected to device
+*/
+bool ConnectionManager::Open()
+{
+    return Open(0);
+}
+
+/** @brief Connects to selected device
+    @param i device index from device list
+    @return 1:Success, 0:failure
+*/
+int ConnectionManager::Open(unsigned i)
+{
+    if(i >= mDevices.size())
+        return 0;
+
+    if(activeControlPort)
+        activeControlPort->Close();
+    switch(mDevices[i].port)
+    {
+    case IConnection::COM_PORT:
+        activeControlPort = m_connections[IConnection::COM_PORT];
+        break;
+    case IConnection::USB_PORT:
+		activeControlPort = m_connections[IConnection::USB_PORT];
+        break;
+    case IConnection::SPI_PORT:
+		activeControlPort = m_connections[IConnection::SPI_PORT];
+        break;
+    default:
+        return 0;
+    }
+    mOpenedDevice = -1;
+    if( i < mDevices.size() )
+    {
+        if( activeControlPort->Open(mDevices[i].portIndex) )
+        {
+            mOpenedDevice = i;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/** @brief Closes connection to device
+*/
+void ConnectionManager::Close()
+{
+    if(activeControlPort)
+    {
+        activeControlPort->Close();
+		//Notify(LMS_Message(MSG_BOARD_DISCONNECTED, "", 0, 0));
+    }
+    mOpenedDevice = -1;
+}
+
+/** @brief Finds all currently connected devices and forms device list
+    @return number of devices found
+*/
+int ConnectionManager::RefreshDeviceList()
+{
+    mDeviceList.clear();
+    mDevices.clear();
+    DeviceInfo dev;
+    for (auto iter = m_connections.begin(); iter != m_connections.end(); ++iter)
+    {
+        vector<string> names;
+        IConnection *port = iter->second;
+        if(port->RefreshDeviceList() > 0)
+        {
+            names = port->GetDeviceNames();
+            for(unsigned i=0; i<names.size(); ++i)
+            {
+                dev.name = names[i];
+                dev.port = iter->first;
+                dev.portIndex = i;
+                mDevices.push_back(dev);
+            }
+        }
+    }
+    for(unsigned i=0; i<mDevices.size(); ++i)
+        mDeviceList.push_back(mDevices[i].name);
+    return mDevices.size();
+}
+
+/** @brief Returns currently opened connection index
+*/
+int ConnectionManager::GetOpenedIndex()
+{
+    return mOpenedDevice;
+}
+
+/** @brief Writes given data to currently opened connection
+    @param buffer outcomming data buffer
+    @param length bytes to write
+    @param timeout_ms timeout in milliseconds
+    @return number of bytes written, on failure negative values
+*/
+int ConnectionManager::Write(const unsigned char *buffer, const int length, int timeout_ms)
+{
+    if(activeControlPort)
+    {
+        int bytesTransferred = activeControlPort->Write(buffer, length, timeout_ms);
+#ifndef NDEBUG
+        if(mLogData)
+        {
+            stringstream ss;
+            ss << "WR(" <<  (bytesTransferred>=0?bytesTransferred: 0) << "): ";
+            ss << std::hex << std::setfill('0');
+            int repeatedZeros = 0;
+            for(int i=length-1; i>=0; --i)
+                if(buffer[i] == 0)
+                    ++repeatedZeros;
+                else break;
+            if(repeatedZeros == 1)
+                repeatedZeros = 0;
+            repeatedZeros = repeatedZeros - (repeatedZeros & 0x1);
+            for(int i=0; i<length-repeatedZeros; ++i)
+                //casting to short to print as numbers
+                ss << " " << std::setw(2) << (unsigned short)buffer[i];
+            if(repeatedZeros > 1)
+                ss << " (00 x " << std::dec << repeatedZeros << " times)";
+            cout << ss.str() << endl;
+        }
+#endif
+        return bytesTransferred;
+    }
+    return -1;
+}
+
+/** @brief Receives data from currently opened connection
+    @param buffer incomming data buffer, must be big enough for length bytes
+    @param length bytes to read
+    @param timeout_ms timeout in milliseconds
+    @return number of bytes received
+*/
+int ConnectionManager::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+    if(activeControlPort)
+    {
+        int bytesTransferred = activeControlPort->Read(buffer, length, timeout_ms);
+#ifndef NDEBUG
+        if(mLogData)
+        {
+            stringstream ss;
+            ss << "RD(" <<  (bytesTransferred>=0?bytesTransferred: 0) << "): ";
+            ss << std::hex << std::setfill('0');
+            int repeatedZeros = 0;
+            for(int i=length-1; i>=0; --i)
+                if(buffer[i] == 0)
+                    ++repeatedZeros;
+                else break;
+            if(repeatedZeros == 2)
+                repeatedZeros = 0;
+            repeatedZeros = repeatedZeros - (repeatedZeros & 0x1);
+            for(int i=0; i<length-repeatedZeros; ++i)
+                //casting to short to print as numbers
+                ss << " " << std::setw(2) << (unsigned short)buffer[i];
+            if(repeatedZeros > 2)
+                ss << " (00 x " << std::dec << repeatedZeros << " times)";
+            cout << ss.str() << endl;
+        }
+#endif
+        return bytesTransferred;
+    }
+    return -1;
+}
+
+int ConnectionManager::WriteStream(const char *buffer, int length)
+{
+	return 0;
+}
+
+int ConnectionManager::ReadStream(char *buffer, int length, unsigned int timeout_ms)
+{
+	/*int handle = activeControlPort->BeginDataReading(buffer, length);
+    activeControlPort->WaitForReading(handle, timeout_ms);
+	long received = length;
+	activeControlPort->FinishDataReading(buffer, received, handle);
+	return received;
+    */
+    long len = length;
+    int status = activeControlPort->ReadDataBlocking(buffer, len, 0);
+    return len;
+}
+
+
+int ConnectionManager::BeginDataReading(char *buffer, long length)
+{
+    return activeControlPort->BeginDataReading(buffer, length);
+}
+/**
+@brief Blocks until data is received or set number of milliseconds have passed.
+@param contextHandle handle returned by BeginDataReading()
+@param timeout_ms number of milliseconds to wait
+@return 1-data received, 0-data not received
+*/
+int ConnectionManager::WaitForReading(int contextHandle, unsigned int timeout_ms)
+{
+    return activeControlPort->WaitForReading(contextHandle, timeout_ms);
+}
+/**
+@brief Finished asynchronous data reading.
+@param buffer where to put received data
+@param length number of bytes to read, will be changed to actual number of bytes received
+@param contextHandle context handle returned by BeginDataReading()
+@return received data length
+*/
+int ConnectionManager::FinishDataReading(char *buffer, long &length, int contextHandle)
+{
+    return activeControlPort->FinishDataReading(buffer, length, contextHandle);
+}
+
+/**
+@brief Aborts reading operations
+*/
+void ConnectionManager::AbortReading()
+{
+    activeControlPort->AbortReading();
+}
+
+/**
+@brief Start asynchronous data sending.
+@param buffer data buffer to be sent
+@param length number of bytes to send.
+@return context handle
+*/
+int ConnectionManager::BeginDataSending(const char *buffer, long length)
+{
+    return activeControlPort->BeginDataSending(buffer, length);
+}
+/**
+@brief Blocks until data is sent or set number of miliseconds have passed.
+@param contextHandle handle returned by BeginDataReading()
+@param timeout_ms number of miliseconds to wait
+@return 1-data sent, 0-data not sent
+*/
+int ConnectionManager::WaitForSending(int contextHandle, unsigned int timeout_ms)
+{
+    return activeControlPort->WaitForSending(contextHandle, timeout_ms);
+}
+/**
+@brief Finished asynchronous data sending.
+@param buffer where to put received data
+@param length number of bytes to send, will be changed to actual number of bytes sent
+@param contextHandle context handle returned by BeginDataReading()
+@return sent data length
+*/
+int ConnectionManager::FinishDataSending(const char *buffer, long &length, int contextHandle)
+{
+    return activeControlPort->FinishDataSending(buffer, length, contextHandle);
+}
+
+/**
+@brief Aborts sending operations
+*/
+void ConnectionManager::AbortSending()
+{
+    activeControlPort->AbortSending();
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.h
new file mode 100644
index 0000000000000000000000000000000000000000..edd01d38332ae3b730f06a4e6c623f75fee10e0a
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionManager.h
@@ -0,0 +1,60 @@
+/**
+    @file ConnectionManager.h
+    @author Lime Microsystems (www.limemicro.com)
+    @brief Class for managing connection to devices
+*/
+
+#ifndef LMS_CONNECTION_MANAGER_H
+#define LMS_CONNECTION_MANAGER_H
+
+#include "IConnection.h"
+#include <map>
+
+class ConnectionManager
+{
+public:
+    struct DeviceInfo
+    {
+        std::string name;
+        IConnection::eConnectionType port;
+        int portIndex;
+    };
+
+    ConnectionManager();
+    ~ConnectionManager();
+    bool IsOpen();
+    bool Open();
+    int Open(unsigned i);
+    void Close();
+    int RefreshDeviceList();
+    int GetOpenedIndex();
+    std::vector<std::string> GetDeviceList(){return mDeviceList;};
+
+    int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	int WriteStream(const char *buffer, int length);
+	int ReadStream(char *buffer, int length, unsigned int timeout_ms);
+
+    int BeginDataReading(char *buffer, long length);
+    int WaitForReading(int contextHandle, unsigned int timeout_ms);
+    int FinishDataReading(char *buffer, long &length, int contextHandle);
+    void AbortReading();
+
+    int BeginDataSending(const char *buffer, long length);
+    int WaitForSending(int contextHandle, unsigned int timeout_ms);
+    int FinishDataSending(const char *buffer, long &length, int contextHandle);
+    void AbortSending();
+
+protected:
+    bool mLogData;
+    /// Port used for communication.
+	IConnection *activeControlPort;
+    std::vector<DeviceInfo> mDevices;
+    std::vector<std::string> mDeviceList;
+    int mOpenedDevice;
+    std::map<IConnection::eConnectionType, IConnection*> m_connections;
+};
+
+#endif // LMS_CONNECTION_MANAGER_H
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e490db4dab480f4105e114809e11838cbd5e339d
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.cpp
@@ -0,0 +1,290 @@
+/**
+    @file   ConnectionSPI.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief  Implementation of communications through SPI port
+*/
+
+#include "ConnectionSPI.h"
+
+#include "string.h"
+#ifdef __unix__
+#include <fstream>
+#include <errno.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/spi/spidev.h>
+#include <linux/i2c-dev.h>
+#endif // LINUX
+
+#include <iostream>
+#include <sstream>
+
+const int ConnectionSPI::cSPI_BUF_SIZE = 128;
+const int ConnectionSPI::cSPI_SPEED_HZ = 2000000;
+
+/** @brief Tries to read EEPROM for Novena board signature
+    @return true if Novena board
+*/
+bool IsNovenaBoard()
+{
+#ifdef __unix__
+    char data[8];
+    int count = 6;
+    memset(data, 0, 8);
+    int addr = 0;
+    struct i2c_rdwr_ioctl_data session;
+    struct i2c_msg messages[2];
+    char set_addr_buf[2];
+    memset(set_addr_buf, 0, sizeof(set_addr_buf));
+    memset(data, 0, count);
+    set_addr_buf[0] = addr>>8;
+    set_addr_buf[1] = addr;
+    messages[0].addr = 0xac>>1;
+    messages[0].flags = 0;
+    messages[0].len = sizeof(set_addr_buf);
+    messages[0].buf = set_addr_buf;
+    messages[1].addr = 0xac>>1;
+    messages[1].flags = I2C_M_RD;
+    messages[1].len = count;
+    messages[1].buf = data;
+    session.msgs = messages;
+    session.nmsgs = 2;
+
+    bool isNovena = false;
+
+    int fd = open("/dev/i2c-2", O_RDWR);
+    if(fd > 0)
+    {
+        if(ioctl(fd, I2C_RDWR, &session) < 0)
+        {
+            perror("Unable to communicate with i2c device");
+            isNovena = false;
+        }
+        if(strcmp("Novena", data) == 0)
+            isNovena = true;
+    }
+    close(fd);
+    return isNovena;
+#else
+    return false;
+#endif
+}
+
+/** @brief Initializes SPI port and exports needed GPIO
+*/
+ConnectionSPI::ConnectionSPI()
+{
+    fd = -1;
+    m_connectionType = SPI_PORT;
+    std::fstream gpio;
+    //export SEN pin
+    gpio.open("/sys/class/gpio/export", ios::out);
+    if(gpio.good())
+    {
+        gpio << 122;
+        gpio.flush();
+        gpio.close();
+        gpio.open("/sys/class/gpio/gpio122/direction", ios::out);
+        gpio << "out";
+        gpio.flush();
+        gpio.close();
+        m_SEN.open("/sys/class/gpio/gpio122/value", ios::out);
+        m_SEN<< 1;
+        m_SEN.flush();
+        cout << "GPIO122: set to 1" << endl;
+    }
+}
+
+ConnectionSPI::~ConnectionSPI()
+{
+    Close();
+    m_SEN.close();
+}
+
+/** @brief Opens connection to first found chip
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionSPI::Open()
+{
+	Close();
+#ifdef __unix__
+	fd = open("/dev/spidev2.0", O_RDWR | O_SYNC);
+	if (fd < 0)
+	{
+        //MessageLog::getInstance()->write("SPI PORT: device not found\n", LOG_ERROR);
+		return IConnection::FAILURE;
+	}
+	int mode = SPI_MODE_0;
+	int ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);
+	if (ret == -1)
+		printf("can't set spi mode");
+
+	ret = ioctl(fd, SPI_IOC_RD_MODE, &mode);
+	if (ret == -1)
+		printf("can't get spi mode");
+
+	/*
+	 * bits per word
+	 */
+    int bits = 8;
+	ret = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
+	if (ret == -1)
+		printf("can't set bits per word");
+
+	ret = ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &bits);
+	if (ret == -1)
+		printf("can't get bits per word");
+
+	/*
+	 * max speed hz
+	 */
+	int speed = cSPI_SPEED_HZ;
+	ret = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+	if (ret == -1)
+		printf("can't set max speed hz");
+
+	ret = ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed);
+	if (ret == -1)
+		printf("can't get max speed hz");
+
+	printf("spi mode: 0x%x\n", mode);
+	printf("bits per word: %d\n", bits);
+	printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
+    return IConnection::SUCCESS;
+#else
+    return IConnection::FAILURE;
+#endif
+}
+
+/** @brief Opens connection to selected chip
+    @param index chip index in device list
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionSPI::Open(unsigned index)
+{
+    return Open();
+}
+
+/** @brief Closes connection to chip
+*/
+void ConnectionSPI::Close()
+{
+#ifdef __unix__
+    close(fd);
+    fd = -1;
+#endif
+}
+
+/** @brief Returns whether chip is connected
+    @return chip is connected
+*/
+bool ConnectionSPI::IsOpen()
+{
+    return (fd >= 0);
+}
+
+/** @brief Sends data through SPI port
+    @param buffer data buffer to send
+    @param length size of data buffer
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes sent
+*/
+int ConnectionSPI::Write(const unsigned char *buffer, int length, int timeout_ms)
+{
+    #ifdef __unix__
+    if(fd < 0)
+        return 0;
+    m_SEN << 0;
+    m_SEN.flush();
+    unsigned long bytesWritten = 0;
+    rxbuf.clear();
+    int bytesReceived = 0;
+    char rxbytes[2];
+    while(bytesWritten < length)
+    {
+        int toWrite = length-bytesWritten > cSPI_BUF_SIZE ? cSPI_BUF_SIZE : length-bytesWritten;
+        for(int i=0; i<toWrite; i+=2)
+        {
+            if(buffer[i] < 0x80) //reading
+            {
+                write(fd, &buffer[i+bytesWritten], 2);
+                bytesReceived += read(fd, rxbytes, 2);
+                rxbuf.push_back(rxbytes[0]);
+                rxbuf.push_back(rxbytes[1]);
+            }
+            else //writing
+            {
+                write(fd, &buffer[i+bytesWritten], 4);
+                i+=2; //data bytes have been written
+            }
+        }
+        bytesWritten += toWrite;
+    }
+    m_SEN << 1;
+    m_SEN.flush();
+    return bytesWritten;
+#else
+    return 0;
+#endif
+}
+
+/** @brief Reads data from SPI port
+    @param buffer pointer to data buffer for receiving
+    @param length number of bytes to read
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes received
+*/
+int ConnectionSPI::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+#ifdef __unix__
+    if(fd < 0)
+        return 0;
+    //because transfer is done in full duplex, function returns data from last transfer
+    int tocpy = length > rxbuf.size() ? rxbuf.size() : length;
+    memcpy(buffer, &rxbuf[0], tocpy);
+    rxbuf.clear();
+    return tocpy;
+#else
+    return 0;
+#endif
+}
+
+/** @brief Finds SPI port
+    @return number of devices found
+*/
+int ConnectionSPI::RefreshDeviceList()
+{
+    m_deviceNames.clear();
+#ifdef __unix__
+    int spidev = open("/dev/spidev2.0", O_RDWR);
+	if (spidev >= 0)
+	{
+	    if(IsNovenaBoard() == true)
+            m_deviceNames.push_back("SPI (Novena)");
+        else
+            m_deviceNames.push_back("SPI");
+	}
+    close(spidev);
+#endif
+    return m_deviceNames.size();
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionSPI::GetDeviceNames()
+{
+    return m_deviceNames;
+}
+
+int ConnectionSPI::GetOpenedIndex()
+{
+    return 0;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..79d9bd9b9b690c470f156acfb1ebdd2a11e0b4ae
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionSPI.h
@@ -0,0 +1,41 @@
+/**
+@file   ConnectionSPI.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data communications through SPI port
+*/
+
+#ifndef CONNECTION_SPI_PORT_H
+#define CONNECTION_SPI_PORT_H
+
+#include "IConnection.h"
+#include <fstream>
+#include <string>
+#include <vector>
+
+class ConnectionSPI : public IConnection
+{
+public:
+    static const int cSPI_BUF_SIZE;
+    static const int cSPI_SPEED_HZ;
+
+	ConnectionSPI();
+	~ConnectionSPI();
+
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned i);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+protected:
+    std::vector<std::string> m_deviceNames;
+	std::vector<unsigned char> rxbuf;
+    int fd;
+    std::fstream m_SEN;
+};
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b99fe6490bc30013bab77583e19deaa74b16c4b8
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.cpp
@@ -0,0 +1,762 @@
+/**
+@file   ConnectionUSB.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief  Data writing and reading through USB port
+*/
+
+#include "ConnectionUSB.h"
+#include <string.h>
+
+#ifdef __unix__
+    #include <thread>
+    #include <chrono>
+#endif
+
+#define USB_TIMEOUT 1000
+
+#define HW_LDIGIRED L"DigiRed"
+#define HW_LDIGIGREEN L"DigiGreen"
+#define HW_LSTREAMER L"Stream"
+
+#define HW_DIGIRED "DigiRed"
+#define HW_DIGIGREEN "DigiGreen"
+#define HW_STREAMER "Stream"
+
+#define CTR_W_REQCODE 0xC1
+#define CTR_W_VALUE 0x0000
+#define CTR_W_INDEX 0x0000
+
+#define CTR_R_REQCODE 0xC0
+#define CTR_R_VALUE 0x0000
+#define CTR_R_INDEX 0x0000
+
+/**	@brief Initializes port type and object necessary to communicate to usb device.
+*/
+ConnectionUSB::ConnectionUSB()
+{
+    m_hardwareName = "";
+    isConnected = false;
+    m_connectionType = USB_PORT;
+#ifndef __unix__
+    USBDevicePrimary = new CCyUSBDevice(NULL);
+    OutCtrEndPt = NULL;
+    InCtrEndPt = NULL;
+	InCtrlEndPt3 = NULL;
+	OutCtrlEndPt3 = NULL;
+#else
+    dev_handle = 0;
+    devs = 0;
+    int r = libusb_init(&ctx); //initialize the library for the session we just declared
+    if(r < 0)
+        printf("Init Error %i\n", r); //there was an error
+    libusb_set_debug(ctx, 3); //set verbosity level to 3, as suggested in the documentation
+#endif
+    currentDeviceIndex = -1;
+}
+
+/**	@brief Closes connection to chip and deallocates used memory.
+*/
+ConnectionUSB::~ConnectionUSB()
+{
+    Close();
+#ifndef __unix__
+    delete USBDevicePrimary;
+#else
+    libusb_exit(ctx);
+#endif
+}
+
+/**	@brief Automatically open first available chip connected to usb port.
+	@return 0-success, other-failure
+*/
+IConnection::DeviceStatus ConnectionUSB::Open()
+{
+    currentDeviceIndex = -1;
+    if(m_deviceNames.size() == 0)
+        RefreshDeviceList();
+
+#ifndef __unix__
+    for(int i=0; i<USBDevicePrimary->DeviceCount(); ++i)
+        if( Open(i) == SUCCESS)
+        {
+            currentDeviceIndex = i;
+            return SUCCESS;
+        }
+#else
+    if(Open(0) == SUCCESS)
+        return SUCCESS;
+#endif
+    return FAILURE;
+}
+
+/**	@brief Tries to open connected USB device and find communication endpoints.
+	@return Returns 1-Success, 0-EndPoints not found or device didn't connect.
+*/
+IConnection::DeviceStatus ConnectionUSB::Open(unsigned index)
+{
+#ifndef __unix__
+	wstring m_hardwareDesc = L"";
+	if( index < USBDevicePrimary->DeviceCount())
+	{
+		if(USBDevicePrimary->Open(index))
+		{
+            m_hardwareDesc = USBDevicePrimary->Product;
+            unsigned int pos;
+            //determine connected board type
+            pos = m_hardwareDesc.find(HW_LDIGIRED, 0);
+            if( pos != wstring::npos )
+                m_hardwareName = HW_DIGIRED;
+            else if (m_hardwareDesc.find(HW_LSTREAMER, 0) != wstring::npos)
+                m_hardwareName = HW_STREAMER;
+            else
+				m_hardwareName = HW_STREAMER;
+
+
+			if (InCtrlEndPt3)
+			{
+				delete InCtrlEndPt3;
+				InCtrlEndPt3 = NULL;
+			}
+			InCtrlEndPt3 = new CCyControlEndPoint(*USBDevicePrimary->ControlEndPt);
+
+			if (OutCtrlEndPt3)
+			{
+				delete OutCtrlEndPt3;
+				OutCtrlEndPt3 = NULL;
+			}
+			OutCtrlEndPt3 = new CCyControlEndPoint(*USBDevicePrimary->ControlEndPt);
+
+			InCtrlEndPt3->ReqCode = CTR_R_REQCODE;
+			InCtrlEndPt3->Value = CTR_R_VALUE;
+			InCtrlEndPt3->Index = CTR_R_INDEX;
+
+			OutCtrlEndPt3->ReqCode = CTR_W_REQCODE;
+			OutCtrlEndPt3->Value = CTR_W_VALUE;
+			OutCtrlEndPt3->Index = CTR_W_INDEX;
+
+			for (int i=0; i<USBDevicePrimary->EndPointCount(); i++)
+				if(USBDevicePrimary->EndPoints[i]->Address == 0x01)
+				{
+					OutEndPt = USBDevicePrimary->EndPoints[i];
+					long len = OutEndPt->MaxPktSize * 64;
+					OutEndPt->SetXferSize(len);
+					break;
+				}
+			for (int i=0; i<USBDevicePrimary->EndPointCount(); i++)
+				if(USBDevicePrimary->EndPoints[i]->Address == 0x81)
+				{
+					InEndPt = USBDevicePrimary->EndPoints[i];
+					long len = InEndPt->MaxPktSize * 64;
+					InEndPt->SetXferSize(len);
+					break;
+				}
+			isConnected = true;
+			return SUCCESS;
+		} //successfully opened device
+	} //if has devices
+    return FAILURE;
+#else
+    if(index >= 0 && index < m_dev_pid_vid.size())
+    {
+		dev_handle = libusb_open_device_with_vid_pid(ctx, m_dev_pid_vid[index].second, m_dev_pid_vid[index].first);
+
+		if(dev_handle == 0)
+            return FAILURE;
+        if(libusb_kernel_driver_active(dev_handle, 0) == 1)   //find out if kernel driver is attached
+        {
+            printf("Kernel Driver Active\n");
+            if(libusb_detach_kernel_driver(dev_handle, 0) == 0) //detach it
+                printf("Kernel Driver Detached!\n");
+        }
+        int r = libusb_claim_interface(dev_handle, 0); //claim interface 0 (the first) of device
+        if(r < 0)
+        {
+            printf("Cannot Claim Interface\n");
+            return CANNOT_CLAIM_INTERFACE;
+        }
+        printf("Claimed Interface\n");
+        isConnected = true;
+        return SUCCESS;
+    }
+    else
+    {
+        return FAILURE;
+    }
+#endif
+}
+
+/**	@brief Closes communication to device.
+*/
+void ConnectionUSB::Close()
+{
+    #ifndef __unix__
+	USBDevicePrimary->Close();
+	InEndPt = NULL;
+	OutEndPt = NULL;
+	if (InCtrlEndPt3)
+	{
+		delete InCtrlEndPt3;
+		InCtrlEndPt3 = NULL;
+	}
+	if (OutCtrlEndPt3)
+	{
+		delete OutCtrlEndPt3;
+		OutCtrlEndPt3 = NULL;
+	}
+    #else
+    if(dev_handle != 0)
+    {
+        libusb_release_interface(dev_handle, 0);
+        libusb_close(dev_handle);
+        dev_handle = 0;
+    }
+    #endif
+    isConnected = false;
+}
+
+/**	@brief Returns connection status
+	@return 1-connection open, 0-connection closed.
+*/
+bool ConnectionUSB::IsOpen()
+{
+    #ifndef __unix__
+    return USBDevicePrimary->IsOpen() && isConnected;
+    #else
+    return isConnected;
+    #endif
+}
+
+/**	@brief Sends given data buffer to chip through USB port.
+	@param buffer data buffer, must not be longer than 64 bytes.
+	@param length given buffer size.
+    @param timeout_ms timeout limit for operation in milliseconds
+	@return number of bytes sent.
+*/
+int ConnectionUSB::Write(const unsigned char *buffer, const int length, int timeout_ms)
+{
+    long len = length;
+    if(IsOpen())
+    {
+		unsigned char* wbuffer = new unsigned char[length];
+		memcpy(wbuffer, buffer, length);
+        if(m_hardwareName == HW_DIGIRED || m_hardwareName == HW_STREAMER)
+        {
+            #ifndef __unix__
+            if(OutCtrlEndPt3)
+                OutCtrlEndPt3->Write(wbuffer, len);
+            else
+                len = 0;
+            #else
+                len = libusb_control_transfer(dev_handle, LIBUSB_REQUEST_TYPE_VENDOR,CTR_W_REQCODE ,CTR_W_VALUE, CTR_W_INDEX, wbuffer, length, USB_TIMEOUT);
+            #endif
+        }
+        else
+        {
+            #ifndef __unix__
+            if(OutCtrEndPt)
+                OutCtrEndPt->XferData(wbuffer, len);
+            else
+                len = 0;
+            #else
+                int actual = 0;
+                libusb_bulk_transfer(dev_handle, 0x01, wbuffer, len, &actual, USB_TIMEOUT);
+                len = actual;
+            #endif
+        }
+		delete wbuffer;
+    }
+    else
+        return 0;
+    return len;
+}
+
+/**	@brief Reads data coming from the chip through USB port.
+	@param buffer pointer to array where received data will be copied, array must be
+	big enough to fit received data.
+	@param length number of bytes to read from chip.
+    @param timeout_ms timeout limit for operation in milliseconds
+	@return number of bytes received.
+*/
+int ConnectionUSB::Read(unsigned char *buffer, const int length, int timeout_ms)
+{
+    long len = length;
+    if(IsOpen())
+    {
+        if(m_hardwareName == HW_DIGIRED || m_hardwareName == HW_STREAMER)
+        {
+            #ifndef __unix__
+            if(InCtrlEndPt3)
+                InCtrlEndPt3->Read(buffer, len);
+            else
+                len = 0;
+            #else
+            len = libusb_control_transfer(dev_handle, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN ,CTR_R_REQCODE ,CTR_R_VALUE, CTR_R_INDEX, buffer, len, USB_TIMEOUT);
+            #endif
+        }
+        else
+        {
+            #ifndef __unix__
+            if(InCtrEndPt)
+                InCtrEndPt->XferData(buffer, len);
+            else
+                len = 0;
+            #else
+                int actual = 0;
+                libusb_bulk_transfer(dev_handle, 0x81, buffer, len, &actual, USB_TIMEOUT);
+                len = actual;
+            #endif
+        }
+    }
+    return len;
+}
+
+#ifdef __unix__
+/**	@brief Function for handling libusb callbacks
+*/
+void callback_libusbtransfer(libusb_transfer *trans)
+{
+	USBTransferContext *context = reinterpret_cast<USBTransferContext*>(trans->user_data);
+	switch(trans->status)
+	{
+    case LIBUSB_TRANSFER_CANCELLED:
+        printf("Transfer canceled\n" );
+        context->bytesXfered = trans->actual_length;
+        context->done = true;
+        context->used = false;
+        context->reset();
+        break;
+    case LIBUSB_TRANSFER_COMPLETED:
+        if(trans->actual_length == context->bytesExpected)
+		{
+			context->bytesXfered = trans->actual_length;
+			context->done = true;
+		}
+		//printf("Transfer complete %i\n", trans->actual_length);
+        break;
+    case LIBUSB_TRANSFER_ERROR:
+        printf("TRANSFER ERRRO\n");
+        break;
+    case LIBUSB_TRANSFER_TIMED_OUT:
+        printf("transfer timed out\n");
+
+        break;
+    case LIBUSB_TRANSFER_OVERFLOW:
+        printf("transfer overflow\n");
+
+        break;
+    case LIBUSB_TRANSFER_STALL:
+        printf("transfer stalled\n");
+        break;
+	}
+    context->mPacketProcessed.notify_one();
+}
+#endif
+
+/** @brief Finds all chips connected to usb ports
+    @return number of devices found
+*/
+int ConnectionUSB::RefreshDeviceList()
+{
+    #ifndef __unix__
+    USBDevicePrimary->Close();
+    currentDeviceIndex = -1;
+    m_deviceNames.clear();
+    string name;
+    if (USBDevicePrimary->DeviceCount())
+    {
+        for (int i=0; i<USBDevicePrimary->DeviceCount(); ++i)
+        {
+            Open(i);
+            name = DeviceName();
+            m_deviceNames.push_back(name);
+        }
+        currentDeviceIndex = -1;
+    }
+    #else
+    m_dev_pid_vid.clear();
+    m_deviceNames.clear();
+    int usbDeviceCount = libusb_get_device_list(ctx, &devs);
+    if(usbDeviceCount > 0)
+    {
+        libusb_device_descriptor desc;
+        for(int i=0; i<usbDeviceCount; ++i)
+        {
+            int r = libusb_get_device_descriptor(devs[i], &desc);
+            if(r<0)
+                printf("failed to get device description\n");
+            int pid = desc.idProduct;
+            int vid = desc.idVendor;
+
+            if( vid == 1204)
+            {
+                if(pid == 34323)
+                {
+                    m_hardwareName = HW_DIGIGREEN;
+                    m_deviceNames.push_back("DigiGreen");
+                    m_dev_pid_vid.push_back( pair<int,int>(pid,vid));
+                }
+                else if(pid == 241)
+                {
+                    m_hardwareName = HW_DIGIRED;
+                    libusb_device_handle *tempDev_handle;
+                    tempDev_handle = libusb_open_device_with_vid_pid(ctx, vid, pid);
+                    if(libusb_kernel_driver_active(tempDev_handle, 0) == 1)   //find out if kernel driver is attached
+                    {
+                        if(libusb_detach_kernel_driver(tempDev_handle, 0) == 0) //detach it
+                            printf("Kernel Driver Detached!\n");
+                    }
+                    if(libusb_claim_interface(tempDev_handle, 0) < 0) //claim interface 0 (the first) of device
+                    {
+                        printf("Cannot Claim Interface\n");
+                    }
+
+                    string fullName;
+                    //check operating speed
+                    int speed = libusb_get_device_speed(devs[i]);
+                    if(speed == LIBUSB_SPEED_HIGH)
+                        fullName = "USB 2.0";
+                    else if(speed == LIBUSB_SPEED_SUPER)
+                        fullName = "USB 3.0";
+                    else
+                        fullName = "USB";
+                    fullName += " (";
+                    //read device name
+                    char data[255];
+                    memset(data, 0, 255);
+                    int st = libusb_get_string_descriptor_ascii(tempDev_handle, 2, (unsigned char*)data, 255);
+                    if(strlen(data) > 0)
+                        fullName += data;
+                    fullName += ")";
+                    libusb_close(tempDev_handle);
+
+                    m_deviceNames.push_back(fullName);
+                    m_dev_pid_vid.push_back( pair<int,int>(pid,vid));
+                }
+            }
+        }
+    }
+    else
+    {
+        libusb_free_device_list(devs, 1);
+        return 0;
+    }
+    #endif
+    return m_deviceNames.size();
+}
+
+void ConnectionUSB::ClearComm()
+{
+}
+
+/**	@return name of currently opened device as string.
+*/
+string ConnectionUSB::DeviceName()
+{
+#ifndef __unix__
+	string name;
+	char tempName[USB_STRING_MAXLEN];
+	//memcpy(tempName, USBDevicePrimary->FriendlyName, USB_STRING_MAXLEN);
+    //name = tempName;
+
+	for (int i = 0; i < USB_STRING_MAXLEN; ++i)
+		tempName[i] = USBDevicePrimary->DeviceName[i];
+    if (USBDevicePrimary->bSuperSpeed == true)
+        name = "USB 3.0";
+    else if (USBDevicePrimary->bHighSpeed == true)
+        name = "USB 2.0";
+    else
+        name = "USB";
+    name += " (";
+	name += tempName;
+	name += ")";
+    return name;
+#else
+    if(dev_handle != 0)
+    {
+        char data[255];
+        int st = libusb_get_string_descriptor_ascii(dev_handle, 2, (unsigned char*)data, 255);
+        return string(data);
+    }
+    return "no name";
+#endif
+}
+
+/**
+	@brief Starts asynchronous data reading from board
+	@param *buffer buffer where to store received data
+	@param length number of bytes to read
+	@return handle of transfer context
+*/
+int ConnectionUSB::BeginDataReading(char *buffer, long length)
+{
+    int i = 0;
+	bool contextFound = false;
+	//find not used context
+    for(i = 0; i<USB_MAX_CONTEXTS; i++)
+    {
+        if(!contexts[i].used)
+        {
+            contextFound = true;
+            break;
+        }
+    }
+    if(!contextFound)
+        return -1;
+    contexts[i].used = true;
+    #ifndef __unix__
+    if(InEndPt)
+        contexts[i].context = InEndPt->BeginDataXfer((unsigned char*)buffer, length, contexts[i].inOvLap);
+	return i;
+    #else
+    unsigned int Timeout = 1000;
+    libusb_transfer *tr = contexts[i].transfer;
+	libusb_fill_bulk_transfer(tr, dev_handle, 0x81, (unsigned char*)buffer, length, callback_libusbtransfer, &contexts[i], Timeout);
+	contexts[i].done = false;
+	contexts[i].bytesXfered = 0;
+	contexts[i].bytesExpected = length;
+    int status = libusb_submit_transfer(tr);
+    int actual = 0;
+    //int status = libusb_bulk_transfer(dev_handle, 0x81, (unsigned char*)buffer, length, &actual, USB_TIMEOUT);
+    if(status != 0)
+        printf("ERROR BEGIN DATA TRANSFER %s\n", libusb_error_name(status));
+    #endif
+    return i;
+}
+
+/**
+	@brief Waits for asynchronous data reception
+	@param contextHandle handle of which context data to wait
+	@param timeout_ms number of miliseconds to wait
+	@return 1-data received, 0-data not received
+*/
+int ConnectionUSB::WaitForReading(int contextHandle, unsigned int timeout_ms)
+{
+    if( contexts[contextHandle].used == true && contextHandle >= 0)
+    {
+    int status = 0;
+    #ifndef __unix__
+	if(InEndPt)
+        status = InEndPt->WaitForXfer(contexts[contextHandle].inOvLap, timeout_ms);
+	return status;
+    #else
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+    while(contexts[contextHandle].done == false && std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count() < timeout_ms)
+	{
+	    struct timeval tv;
+	    tv.tv_sec = 1;
+	    tv.tv_usec = 0;
+		//if(libusb_handle_events(ctx) != 0)
+		if(libusb_handle_events_timeout_completed(ctx, &tv, NULL) != 0)
+            printf("error libusb_handle_events %i\n", status);
+		t2 = chrono::high_resolution_clock::now();
+		std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+    std::unique_lock<std::mutex> lck(contexts[contextHandle].m_lock);
+    while(contexts[contextHandle].done == false) //is changed in libusb callback
+    {
+        if(contexts[contextHandle].mPacketProcessed.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+            return 0;
+    }
+	return contexts[contextHandle].done == true;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Finishes asynchronous data reading from board
+	@param buffer array where to store received data
+	@param length number of bytes to read, function changes this value to number of bytes actually received
+	@param contextHandle handle of which context to finish
+	@return false failure, true number of bytes received
+*/
+int ConnectionUSB::FinishDataReading(char *buffer, long &length, int contextHandle)
+{
+    if( contexts[contextHandle].used == true && contextHandle >= 0)
+    {
+    #ifndef __unix__
+    int status = 0;
+    if(InEndPt)
+        status = InEndPt->FinishDataXfer((unsigned char*)buffer, length, contexts[contextHandle].inOvLap, contexts[contextHandle].context);
+    contexts[contextHandle].used = false;
+    contexts[contextHandle].reset();
+    return length;
+    #else
+	length = contexts[contextHandle].bytesXfered;
+	contexts[contextHandle].used = false;
+	contexts[contextHandle].reset();
+	return length;
+    #endif
+    }
+    else
+        return 0;
+}
+
+int ConnectionUSB::ReadDataBlocking(char *buffer, long &length, int timeout_ms)
+{
+#ifndef __unix__
+    return InEndPt->XferData((unsigned char*)buffer, length);
+#else
+    return 0;
+#endif
+}
+
+
+/**
+	@brief Aborts reading operations
+*/
+void ConnectionUSB::AbortReading()
+{
+#ifndef __unix__
+	InEndPt->Abort();
+#else
+    for(int i=0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        libusb_cancel_transfer( contexts[i].transfer );
+    }
+#endif
+}
+
+/**
+	@brief Starts asynchronous data Sending to board
+	@param *buffer buffer to send
+	@param length number of bytes to send
+	@return handle of transfer context
+*/
+int ConnectionUSB::BeginDataSending(const char *buffer, long length)
+{
+    int i = 0;
+	//find not used context
+	bool contextFound = false;
+    for(i = 0; i<USB_MAX_CONTEXTS; i++)
+    {
+        if(!contextsToSend[i].used)
+        {
+            contextFound = true;
+            break;
+        }
+    }
+    if(!contextFound)
+        return -1;
+    contextsToSend[i].used = true;
+    #ifndef __unix__
+    if(OutEndPt)
+        contextsToSend[i].context = OutEndPt->BeginDataXfer((unsigned char*)buffer, length, contextsToSend[i].inOvLap);
+	return i;
+    #else
+    unsigned int Timeout = 1000;
+    libusb_transfer *tr = contextsToSend[i].transfer;
+    //libusb_set_iso_packet_lengths(contexts[i].transfer, 512*64);
+	libusb_fill_bulk_transfer(tr, dev_handle, 0x1, (unsigned char*)buffer, length, callback_libusbtransfer, &contextsToSend[i], Timeout);
+	contextsToSend[i].done = false;
+	contextsToSend[i].bytesXfered = 0;
+	contextsToSend[i].bytesExpected = length;
+    libusb_submit_transfer(tr);
+    #endif
+    return i;
+}
+
+/**
+	@brief Waits for asynchronous data sending
+	@param contextHandle handle of which context data to wait
+	@param timeout_ms number of miliseconds to wait
+	@return 1-data received, 0-data not received
+*/
+int ConnectionUSB::WaitForSending(int contextHandle, unsigned int timeout_ms)
+{
+    if( contextsToSend[contextHandle].used == true )
+    {
+    #ifndef __unix__
+	int status = 0;
+	if(OutEndPt)
+        status = OutEndPt->WaitForXfer(contextsToSend[contextHandle].inOvLap, timeout_ms);
+	return status;
+    #else
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+    while(contextsToSend[contextHandle].done == false && std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count() < timeout_ms)
+	{
+	    struct timeval tv;
+	    tv.tv_sec = 1;
+	    tv.tv_usec = 0;
+        int status = libusb_handle_events_timeout_completed(ctx, &tv, NULL);
+        if(status != 0)
+            printf("error libusb_handle_events %i\n", status);
+        t2 = chrono::high_resolution_clock::now();
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+	std::unique_lock<std::mutex> lck(contextsToSend[contextHandle].m_lock);
+    while(contextsToSend[contextHandle].done == false) //is changed in libusb callback
+    {
+        if(contextsToSend[contextHandle].mPacketProcessed.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+            return 0;
+    }
+	return contextsToSend[contextHandle].done == true;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Finishes asynchronous data sending to board
+	@param buffer array where to store received data
+	@param length number of bytes to read, function changes this value to number of bytes acctually received
+	@param contextHandle handle of which context to finish
+	@return false failure, true number of bytes sent
+*/
+int ConnectionUSB::FinishDataSending(const char *buffer, long &length, int contextHandle)
+{
+    if( contextsToSend[contextHandle].used == true)
+    {
+    #ifndef __unix__
+	if(OutEndPt)
+        OutEndPt->FinishDataXfer((unsigned char*)buffer, length, contextsToSend[contextHandle].inOvLap, contextsToSend[contextHandle].context);
+    contextsToSend[contextHandle].used = false;
+    contextsToSend[contextHandle].reset();
+    return length;
+    #else
+	length = contextsToSend[contextHandle].bytesXfered;
+	contextsToSend[contextHandle].used = false;
+    contextsToSend[contextHandle].reset();
+	return length;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Aborts sending operations
+*/
+void ConnectionUSB::AbortSending()
+{
+#ifndef __unix__
+	OutEndPt->Abort();
+#else
+    for (int i = 0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        libusb_cancel_transfer(contextsToSend[i].transfer);
+    }
+    for(int i=0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        contextsToSend[i].used = false;
+        contextsToSend[i].reset();
+    }
+#endif
+}
+
+int ConnectionUSB::GetOpenedIndex()
+{
+    return currentDeviceIndex;
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionUSB::GetDeviceNames()
+{
+    return m_deviceNames;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.h
new file mode 100644
index 0000000000000000000000000000000000000000..f3048c184200e5bb5bdb875392c957ca45c75a7b
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/ConnectionUSB.h
@@ -0,0 +1,144 @@
+/**
+@file   ConnectionUSB.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data writing and reading through USB port
+*/
+
+#ifndef USB_PORT_CONNECTION_H
+#define USB_PORT_CONNECTION_H
+
+#include "IConnection.h"
+
+#ifndef __unix__
+#include "windows.h"
+#include "CyAPI.h"
+#else
+#include <libusb-1.0/libusb.h>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
+#endif
+
+#define USB_MAX_CONTEXTS 64 //maximum number of contexts for asynchronous transfers
+
+/** @brief Wrapper class for holding USB asynchronous transfers contexts
+*/
+class USBTransferContext
+{
+public:
+	USBTransferContext() : used(false)
+	{
+		#ifndef __unix__
+		inOvLap = new OVERLAPPED;
+		memset(inOvLap, 0, sizeof(OVERLAPPED));
+		inOvLap->hEvent = CreateEvent(NULL, false, false, NULL);
+		context = NULL;
+		#else
+		transfer = libusb_alloc_transfer(0);
+		bytesXfered = 0;
+		bytesExpected = 0;
+		done = 0;
+		#endif
+	}
+	~USBTransferContext()
+	{
+		#ifndef __unix__
+		CloseHandle(inOvLap->hEvent);
+		delete inOvLap;
+		#else
+		libusb_free_transfer(transfer);
+		#endif
+	}
+	bool reset()
+	{
+        if(used)
+            return false;
+        #ifndef __unix__
+        CloseHandle(inOvLap->hEvent);
+        memset(inOvLap, 0, sizeof(OVERLAPPED));
+        inOvLap->hEvent = CreateEvent(NULL, false, false, NULL);
+        #endif
+        return true;
+	}
+	bool used;
+	#ifndef __unix__
+	PUCHAR context;
+	OVERLAPPED *inOvLap;
+	#else
+	libusb_transfer* transfer;
+	long bytesXfered;
+	long bytesExpected;
+	bool done;
+	std::mutex m_lock;
+    std::condition_variable mPacketProcessed;
+	#endif
+};
+
+class ConnectionUSB : public IConnection
+{
+public:
+	ConnectionUSB();
+	~ConnectionUSB();
+
+    void FindDevices();
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned index);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	virtual int BeginDataReading(char *buffer, long length);
+	virtual int WaitForReading(int contextHandle, unsigned int timeout_ms);
+	virtual int FinishDataReading(char *buffer, long &length, int contextHandle);
+	virtual void AbortReading();
+    virtual int ReadDataBlocking(char *buffer, long &length, int timeout_ms);
+
+	virtual int BeginDataSending(const char *buffer, long length);
+	virtual int WaitForSending(int contextHandle, unsigned int timeout_ms);
+	virtual int FinishDataSending(const char *buffer, long &length, int contextHandle);
+	virtual void AbortSending();
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+	void ClearComm();
+private:
+    int currentDeviceIndex;
+    std::string DeviceName();
+
+    std::vector<std::string> m_deviceNames;
+    std::string m_hardwareName;
+    int m_hardwareVer;
+
+	USBTransferContext contexts[USB_MAX_CONTEXTS];
+	USBTransferContext contextsToSend[USB_MAX_CONTEXTS];
+	void Initialize();
+
+	bool isConnected;
+	int currentPortIndex;
+
+	#ifndef __unix__
+	CCyUSBDevice *USBDevicePrimary;
+	//control endpoints for DigiRed
+	CCyControlEndPoint *InCtrlEndPt3;
+	CCyControlEndPoint *OutCtrlEndPt3;
+
+    //control endpoints for DigiGreen
+	CCyUSBEndPoint *OutCtrEndPt;
+	CCyUSBEndPoint *InCtrEndPt;
+
+    //end points for samples reading and writing
+	CCyUSBEndPoint *InEndPt;
+	CCyUSBEndPoint *OutEndPt;
+
+	#else
+    libusb_device **devs; //pointer to pointer of device, used to retrieve a list of devices
+    libusb_device_handle *dev_handle; //a device handle
+    libusb_context *ctx; //a libusb session
+    std::vector<std::pair<int,int> > m_dev_pid_vid;
+	#endif
+};
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/IConnection.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/IConnection.h
new file mode 100644
index 0000000000000000000000000000000000000000..5804f1149f104c4d834c710eaf6f38f75bc9a6d3
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/connectionManager/IConnection.h
@@ -0,0 +1,68 @@
+/**
+    @file IConnection.h
+    @author Lime Microsystems
+    @brief Interface class for connection types
+*/
+
+#ifndef ICONNECTION_H
+#define ICONNECTION_H
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+class IConnection
+{
+public:
+    /// Supported connection types.
+    enum eConnectionType
+    {
+	    CONNECTION_UNDEFINED = -1,
+	    COM_PORT = 0,
+	    USB_PORT = 1,
+	    SPI_PORT = 2,
+	    //insert new types here
+	    CONNECTION_TYPES_COUNT //used only for memory allocation
+    };
+
+    enum DeviceStatus
+    {
+        SUCCESS,
+        FAILURE,
+        END_POINTS_NOT_FOUND,
+        CANNOT_CLAIM_INTERFACE
+    };
+
+	IConnection() : m_connectionType(CONNECTION_UNDEFINED){};
+	virtual ~IConnection(){};
+	virtual int RefreshDeviceList() = 0;
+	virtual DeviceStatus Open(unsigned i) = 0;
+	virtual void Close() = 0;
+	virtual bool IsOpen() = 0;
+	virtual int GetOpenedIndex() = 0;
+
+	virtual int Write(const unsigned char *buffer, int length, int timeout_ms = 0) = 0;
+	virtual int Read(unsigned char *buffer, int length, int timeout_ms = 0) = 0;
+
+	virtual std::vector<std::string> GetDeviceNames() = 0;
+
+	virtual eConnectionType GetType() { return m_connectionType; };
+	virtual bool SetParam(const char *name, const char* value) {return false;};
+
+	virtual int BeginDataReading(char *buffer, long length){ return -1; };
+	virtual int WaitForReading(int contextHandle, unsigned int timeout_ms){ return 0;};
+	virtual int FinishDataReading(char *buffer, long &length, int contextHandle){ return 0;}
+	virtual void AbortReading(){};
+    virtual int ReadDataBlocking(char *buffer, long &length, int timeout_ms){ return 0; }
+
+	virtual int BeginDataSending(const char *buffer, long length){ return -1; };
+	virtual int WaitForSending(int contextHandle, unsigned int timeout_ms){ return 0;};
+	virtual int FinishDataSending(const char *buffer, long &length, int contextHandle){ return 0;}
+	virtual void AbortSending(){};
+protected:
+	eConnectionType m_connectionType;
+};
+
+#endif
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/INI.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/INI.h
new file mode 100644
index 0000000000000000000000000000000000000000..de54b4e7b49d9b8b113aa5abf7cc2849dce4df53
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/INI.h
@@ -0,0 +1,639 @@
+/*
+   Feather INI Parser - 1.40
+   You are free to use this however you wish.
+
+   If you find a bug, please attept to debug the cause.
+   Post your environment details and the cause or fix in the issues section of GitHub.
+
+   Written by Turbine.
+
+   Website:
+   https://github.com/Turbine1991/feather-ini-parser
+   http://code.google.com/p/feather-ini-parser/downloads
+
+   Help:
+   Bundled example & readme.
+   http://code.google.com/p/feather-ini-parser/wiki/Tutorials
+*/
+
+#pragma once
+
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FINI_SAFE
+#define FINI_BUFFER_SIZE 128
+
+#if __cplusplus >= 201103L
+  #include <unordered_map>
+  #define FINI_CPP11
+  #define ALLOCATE_SECTIONS 100
+  #define ALLOCATE_KEYS 5
+#else
+  #include <map>
+#endif
+
+#ifdef FINI_WIDE_SUPPORT
+  #include <wchar.h>
+
+  typedef std::wstringstream fini_sstream_t;
+  typedef std::wstring fini_string_t;
+  typedef wchar_t fini_char_t;
+  typedef std::wifstream fini_ifstream_t;
+  typedef std::wofstream fini_ofstream_t;
+
+  #define fini_strlen(a) wcslen(a)
+  #define fini_strncpy(a, b) wcscpy(a, b)
+  #define fini_strncpy(a, b, c) wcsncpy(a, b, c)
+  #define fini_strtok(a, b) wcstok(a, b)
+
+  #define _T(x) L ##x
+#else
+  #include <cstring>
+
+  typedef std::stringstream fini_sstream_t;
+  typedef std::string fini_string_t;
+  typedef char fini_char_t;
+  typedef std::ifstream fini_ifstream_t;
+  typedef std::ofstream fini_ofstream_t;
+
+  #define fini_strlen(a) strlen(a)
+  #define fini_strcpy(a, b) strcpy(a, b)
+  #define fini_strncpy(a, b, c) strncpy(a, b, c)
+  #define fini_strtok(a, b) strtok(a, b)
+
+  #define _T(x) x
+#endif
+
+#define CHAR_SIZE sizeof(fini_char_t)
+
+///Simple converter using templates and streams to effectively required for the flexibility of handling native types
+class Converters
+{
+public:
+   template <typename T, typename U>
+     static T Convert(U value);
+   template <typename T>
+      static void GetLine(fini_sstream_t& out, T& value);
+   static void GetLine(fini_sstream_t& out, fini_string_t& value);
+   template <typename T>
+      static size_t GetDataSize(T& value);
+   static size_t GetDataSize(fini_string_t value);
+};
+
+///
+template <typename T = fini_string_t, typename U = fini_string_t, typename V = fini_string_t>
+   class INI
+{
+public:
+   typedef T section_t;
+   typedef U key_t;
+   typedef V value_t;
+   typedef INI<section_t, key_t, value_t> ini_t;
+
+///Type definition declarations
+#ifdef FINI_CPP11
+   typedef typename std::unordered_map<key_t, value_t> keys_t;
+   typedef typename std::unordered_map<section_t, keys_t*> sections_t;
+#else
+   typedef typename std::map<key_t, value_t> keys_t;
+   typedef typename std::map<section_t, keys_t*> sections_t;
+#endif
+
+   typedef typename keys_t::iterator keysit_t;
+   typedef typename sections_t::iterator sectionsit_t;
+
+   typedef typename std::pair<key_t, value_t> keyspair_t;
+   typedef typename std::pair<section_t, keys_t*> sectionspair_t;
+
+   typedef char data_t;
+
+   enum source_e {SOURCE_FILE, SOURCE_MEMORY};
+
+///Data members
+   std::string filename;
+   data_t* data;
+   size_t dataSize;
+   keys_t* current;
+   sections_t sections;
+   source_e source;
+
+///Constuctor/Destructor
+   //Specify the filename to associate and whether to parse immediately
+   INI(const std::string filename, bool doParse): filename(filename)
+   {
+      init(SOURCE_FILE, doParse);
+   }
+
+   //Used for loading INI from memory
+   INI(void* data, size_t dataSize, bool doParse): data((data_t*)data), dataSize(dataSize)
+   {
+      init(SOURCE_MEMORY, doParse);
+   }
+
+   ~INI()
+   {
+      clear();
+   }
+
+///Access Content
+   //Provide bracket access to section contents
+   keys_t& operator[](section_t section)
+   {
+   #ifdef FINI_SAFE
+     if (!sections[section])
+       sections[section] = new keys_t;
+   #endif
+
+      return *sections[section];
+   }
+
+   //Create a new section and select it
+   bool create(const section_t section)
+   {
+      if (select(section))
+         return false;
+
+      current = new keys_t;
+      sections[section] = current;
+
+      reserveKeys(current);
+
+      return true;
+   }
+
+   //Select a section for performing operations
+   bool select(const section_t section)
+   {
+      sectionsit_t sectionsit = sections.find(section);
+      if (sectionsit == sections.end())
+         return false;
+
+      current = sectionsit->second;
+
+      return true;
+   }
+
+///Set
+   //Assign a value for key under the selected section
+   bool set(const key_t key, const value_t value)
+   {
+      if (current == NULL)
+         return false;
+
+      (*current)[key] = value;
+
+      return true;
+   }
+
+   template <typename W, typename X>
+      bool set(const W key, const X value)
+         { return set(Converters::Convert<key_t>(key), Converters::Convert<value_t>(value)); }
+
+///Get
+   value_t get(const key_t key, value_t def = value_t())
+   {
+      keysit_t it = current->find(key);
+      if (current == NULL || it == current->end())
+         return def;
+
+      return it->second;
+   }
+
+   value_t get(const section_t section, const key_t key, value_t def)
+   {
+      if (!select(section))
+         return def;
+
+      return get(key, def);
+   }
+
+   template <typename W, typename X>
+      X get(const W key, const X def = value_t())
+         { return Converters::Convert<X>(get(Converters::Convert<key_t>(key), Converters::Convert<value_t>(def))); }
+
+   template <typename W>
+      fini_string_t get(const W key, const fini_char_t* def = _T(""))  //Handle C string default value without casting
+         { return Converters::Convert<fini_string_t>(get(Converters::Convert<key_t>(key), Converters::Convert<value_t>(def))); }
+
+   template <typename W, typename X, typename Y>
+      Y get(const W section, const X key, const Y def)
+         { return Converters::Convert<Y>(get(Converters::Convert<section_t>(section), Converters::Convert<key_t>(key), Converters::Convert<value_t>(def))); }
+
+   template <typename W, typename X>
+      fini_string_t get(const W section, const X key, const fini_char_t* def)  //Handle C string default value without casting
+         { return Converters::Convert<fini_string_t>(Converters::Convert<section_t>(section), get(Converters::Convert<key_t>(key), Converters::Convert<value_t>(def))); }
+
+///Functions
+   void parse(std::istream& file)
+   {
+      fini_char_t line[FINI_BUFFER_SIZE];
+      bool first = true;
+      fini_sstream_t out;
+
+      while(!file.eof())
+      {
+         file.getline(line, FINI_BUFFER_SIZE);
+
+         if (first)
+         {
+            first = false;
+            if (line[0] == 0xEF) //Allows handling of UTF-16/32 documents
+            {
+               memmove(line, line + (CHAR_SIZE * 3), CHAR_SIZE * (FINI_BUFFER_SIZE - 3));
+               return;
+            }
+         }
+
+         nake(line);
+
+         if (line[0])
+         {
+            size_t len = fini_strlen(line);
+            if (len > 0 && !((len >= 2 && (line[0] == '/' && line[1] == '/')) || (len >= 1 && line[0] == '#')))  //Ignore comment and empty lines
+            {
+               if (line[0] == '[')  //Section
+               {
+                  section_t section;
+                  size_t length = fini_strlen(line) - 2;  //Without section brackets
+                  while(isspace(line[length + 1]))  //Leave out any additional new line characters, not "spaces" as the name suggests
+                     --length;
+
+                  fini_char_t* ssection = (fini_char_t*)calloc(CHAR_SIZE, length + 1);
+                  fini_strncpy(ssection, line + 1, length);  //Count after first bracket
+
+                  current = new keys_t;
+
+                  out << ssection;
+                  free(ssection);
+                  Converters::GetLine(out, section);
+
+                  sections[section] = current;
+               }
+               else  //Key
+               {
+                  key_t key;
+                  value_t value;
+
+                  fini_char_t* skey;
+                  fini_char_t* svalue;
+
+                  skey = fini_strtok(line, _T("="));
+                  svalue = fini_strtok(NULL, _T("\n"));
+
+                  if (skey && svalue)
+                  {
+                     size_t index = 0;  //Without section brackets
+                     while(isspace(skey[index]))  //Leave out any additional new line characters, not "spaces" as the name suggests
+                        index++;
+
+                     if (index != 0)  //Has preceeding white space
+                        fini_strcpy(skey, skey + index);
+
+                     out << skey;
+
+                     Converters::GetLine(out, key);
+
+                     out.clear();
+                     out.str(fini_string_t());
+
+                     out << svalue;
+                     Converters::GetLine(out, value);
+
+                     if (value != value_t())
+                       (*current)[key] = value;
+                  }
+               }
+
+               out.clear();
+               out.str(fini_string_t()); //Clear existing stream;
+            }
+         }
+      }
+   }
+
+   //Parse an INI's contents into memory from the filename given during construction
+   bool parse()
+   {
+      switch(source)
+      {
+      case SOURCE_FILE: {
+            fini_ifstream_t file(filename.c_str());
+
+            if (!file.is_open())
+               return false;
+
+            parse(file);
+
+            file.close();
+         }
+         break;
+
+      case SOURCE_MEMORY: {
+            std::stringstream sstream;
+            sstream.rdbuf()->pubsetbuf(data, dataSize);
+
+            parse(sstream);
+         }
+         break;
+      }
+
+      return true;
+   }
+
+   bool parseBinary()
+   {
+      fini_ifstream_t file(filename.c_str(), std::ios::binary);
+      if (!file.is_open())
+         return false;
+
+      size_t sectionCount;
+      size_t keyCount;
+      key_t key;
+      value_t value;
+      section_t section;
+
+      //file.read((fini_char_t*)&sectionCount, sizeof(sectionCount));
+      file >> sectionCount;
+
+      for(size_t i = 0; i < sectionCount; i++)
+      {
+         if (i > 0)
+            file.seekg(1 + file.tellg());
+
+         file.read((fini_char_t*)&keyCount, sizeof(keyCount));
+         file >> section;
+
+         create(section);
+
+         for(size_t j = 0; j < keyCount; j++)
+         {
+            file >> key;
+            file >> value;
+            set(key, value);
+         }
+      }
+
+      file.close();
+
+      return true;
+   }
+
+   //Clear the contents from memory
+   void clear()
+   {
+      clean();
+      sections.clear();
+   }
+
+///Output
+   //Save from memory into file
+   bool save(const std::string filename = "")
+   {
+      if (!hasFileAssociation(filename))
+         return false;
+
+      fini_ofstream_t file(((filename == "")? this->filename: filename).c_str(), std::ios::trunc);
+      if (!file.is_open())
+         return false;
+
+      //Loop through sections
+      for(typename INI::sectionsit_t i = sections.begin(); i != sections.end(); i++)
+      {
+         if (i->second->size() == 0)  //No keys/values in section, skip to next
+            continue;
+
+         //Write section
+         const fini_string_t temp = makeSection(i->first);
+         const fini_char_t* line = temp.c_str();
+         file.write(line, fini_strlen(line));
+
+         for(typename INI::keysit_t j = i->second->begin(); j != i->second->end(); j++)
+         {
+            //Write key and value
+            const fini_string_t temp = makeKeyValue(j->first, j->second);
+            const fini_char_t* line = temp.c_str();
+            file.write(line, fini_strlen(line));
+         }
+      }
+
+      file.close();
+
+      return true;
+   }
+
+   //Saves it without any conventional INI formatting characters, however it only uses string streams
+   bool saveBinary(const std::string filename = "")
+   {
+      if (!hasFileAssociation(filename))
+         return false;
+
+      fini_ofstream_t file(((filename == "")? this->filename: filename).c_str(), std::ios::trunc | std::ios::binary);
+      if (!file.is_open())
+         return false;
+
+      size_t sectionCount = sections.size();
+      size_t keyCount;
+
+      file.write((fini_char_t*)&sectionCount, sizeof(sectionCount));
+
+      //Loop through sections
+      for(typename INI::sectionsit_t i = sections.begin(); i != sections.end(); i++)
+      {
+         keyCount = i->second->size();
+         file.write((fini_char_t*)&keyCount, sizeof(keyCount));
+
+         file << i->first << std::endl;
+
+         for(typename INI::keysit_t j = i->second->begin(); j != i->second->end(); j++)
+         {
+            file << j->first << std::endl;
+            file << j->second << std::endl;
+         }
+      }
+
+      file.close();
+
+      return true;
+   }
+
+   //Saves it as a true binary file, intended to replace the existing one. Don't bother using it with all strings.
+   bool saveBinaryExperimental(std::string filename = "")
+   {
+      if (!hasFileAssociation(filename))
+         return false;
+
+      fini_ofstream_t file(((filename == "")? this->filename: filename).c_str(), std::ios::trunc | std::ios::binary);
+      if (!file.is_open())
+         return false;
+
+      size_t sectionCount = sections.size();
+      size_t keyCount;
+
+      file.write((fini_char_t*)&sectionCount, sizeof(sectionCount));
+
+      //Loop through sections
+      for(typename INI::sectionsit_t i = sections.begin(); i != sections.end(); i++)
+      {
+         keyCount = i->second->size();
+         file.write((fini_char_t*)&keyCount, sizeof(keyCount));
+
+         file.write((fini_char_t*)&i->first, Converters::GetDataSize(i->first));
+
+         for(typename INI::keysit_t j = i->second->begin(); j != i->second->end(); j++)
+         {
+            file.write((fini_char_t*)&j->first, Converters::GetDataSize(j->first));
+            file.write((fini_char_t*)&j->second, Converters::GetDataSize(j->second));
+         }
+      }
+
+      file.close();
+
+      return true;
+   }
+
+   //Alows another INI's contents to be insert into another, with the ability to retain the original values
+   void merge(ini_t& other, bool retainValues = true)
+   {
+      for(typename INI::sectionsit_t i = other.sections.begin(); i != other.sections.end(); i++)
+      {
+         if (!select(i->first)) //Create and insert all key values into a missing section
+         {
+            keys_t* keys = new keys_t(*i->second);
+            sections.insert(std::make_pair(i->first, keys));
+         }
+         else
+         {
+            for(typename INI::keysit_t j = i->second->begin(); j != i->second->end(); j++)
+            {
+               keysit_t it = current->find(j->first);
+               if (it == current->end())
+                  current->insert(std::make_pair(j->first, j->second));
+               else if (!retainValues)
+                  it->second = j->second;
+            }
+         }
+      }
+   }
+
+private:
+///Functions
+   //Init the INI in with values set by constructor
+   void init(source_e source, bool doParse)
+   {
+      this->source = source;
+
+      reserveSections();
+      if (doParse)
+         parse();
+   }
+
+   //Clean the contents for descruction
+   void clean()
+   {
+      for(sectionsit_t i = sections.begin(); i != sections.end(); i++)
+         delete i->second;
+
+      current = NULL;
+   }
+
+   //Make any alterations to the raw line
+   void nake(const fini_char_t*)  //Strip the line of any non-interpretable characters
+   {
+
+   }
+
+   void reserveSections()
+   {
+   #ifdef FINI_CPP11
+      sections.reserve(ALLOCATE_SECTIONS);
+   #endif
+   }
+
+   void reserveKeys(keys_t* current)
+   {
+   #ifdef FINI_CPP11
+      current->reserve(ALLOCATE_KEYS);
+   #endif
+   }
+
+   bool hasFileAssociation(std::string filename)
+   {
+      if (source == SOURCE_MEMORY && filename == "") //No association to a file
+         return false;
+
+      return true;
+   }
+
+///Output
+   //Creates a section as a string
+   fini_string_t makeSection(const section_t& section)
+   {
+      fini_sstream_t line;
+      line << '[' << section << ']' << std::endl;
+
+      return line.str();
+   }
+
+   //Creates a key and a value as a string
+   fini_string_t makeKeyValue(const key_t& key, const value_t& value)
+   {
+      fini_sstream_t line;
+      line << key << '=' << value << std::endl;
+
+      return line.str();
+   }
+};
+
+///Definitions
+template <typename T, typename U>
+  inline T Converters::Convert(U value)
+{
+  fini_sstream_t sout;
+  T result;
+
+  sout << value;
+  sout >> result;
+
+  sout.str(fini_string_t());
+
+  return result;
+}
+
+template <>
+  inline fini_string_t Converters::Convert<fini_string_t, fini_string_t>(fini_string_t value)
+{
+  return value;
+}
+
+template <>
+  inline fini_string_t Converters::Convert<fini_string_t>(const fini_char_t* value)
+{
+  return value;
+}
+
+template <typename T>
+  inline void Converters::GetLine(fini_sstream_t& out, T& value)
+{
+  out >> value;
+}
+
+inline void Converters::GetLine(fini_sstream_t& out, fini_string_t& value)
+{
+  std::getline(out, value);
+}
+
+template <typename T>
+   inline size_t Converters::GetDataSize(T& value)
+{
+   return sizeof(value);
+}
+
+inline size_t Converters::GetDataSize(fini_string_t value)
+{
+   return value.size() + 1;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/LICENSE b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7d961cc6e56bcf624d2b15806266311da47fe28a
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Turbine1991
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/README.md b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f1245971cd05a49f7c070347e304c444b003d480
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/README.md
@@ -0,0 +1,47 @@
+feather-ini-parser
+==================
+
+Simple like your girlfriend, fast, lightweight, header, portable INI parser for ANSI C++.
+
+Why use feather-ini-parser? It's a fast, intuitive, uses C++, supports native data types, wide char support (enable), converting to data types simply by setting a default value or providing the type as a template parameter.
+
+##Methods
+
+Statement     | Return Type
+------------- | -------------
+ini(filename, doParse)|constructor
+ini(data, dataSize, doParse)|constructor
+ini.parse()|bool
+ini.merge(other INI, retainValues)|void
+ini.create(section)|bool
+ini.select(section)|bool
+ini.set(key, value)|bool
+ini.get(key, dvalue = value_t())|dvalue_t
+ini.save(filename = "")|bool
+ini.clear()|bool
+ini[section][key]|value_t&
+ini[section]|keys_t&
+
+##Example
+```
+#include <iostream>
+#include "INI.h"
+
+using namespace std;
+```
+...
+```
+typedef INI<> ini_t;
+//or
+//typedef INI<section_t, key_t, value_t> ini_t;
+
+ini_t ini("filename.ini", true);
+ini.create("section1"); //Create and select section1
+ini.set("key", "value");
+cout << ini.get("keynumeric", -1) << endl;
+ini["section2"]["key"] = "value";
+ini.save();
+```
+
+##More
+Please see the example .cpp file and Code::Blocks .cbp project for a compilable GCC and VSC++ example. Additionally includes enabling wide char support and iterating through contents.
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/example.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/example.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..462dd241dcd3525320d3d01001ea9ac209afccee
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/example.cpp
@@ -0,0 +1,130 @@
+#include <iostream>
+#include <cstring>
+#include <stdint.h>
+#include "../INI.h"
+
+using namespace std;
+
+void centerString(string str); //Printing to console
+std::string getStringFromFile(const std::string& path); //Source for data loading from memory.
+
+int main()
+{
+   ///Declare
+   typedef INI<> ini_t;  //Makes things shorter/easier to write <Section, Key, Value>
+   //or
+   //typedef INI<string, string, string> ini_t;  //Equivelant to previous line when wide characters are disabled
+   ini_t ini("file.ini", true);  //File to open/default save filename. The constuctor is set to parse by default, unless specified as false
+
+   ///Manipulate and access contents
+   centerString("########## Access & Manipulate Contents ##########");
+
+   //Common usage
+   ini.create("Section 1");
+   ini.create("Section 2");
+   ini.get("Key1", "DefaultValue");
+   ini.select("Section 1");
+   ini.set("Key2", "Value");
+   ini.save(); //Save contents to file, optional filename parameter available
+   ini.clear(); //Clear INI contents from memory
+
+   //Extended usage
+   ini["Section Name"]["Key"] = "Value";  //You are not required to create a section first
+
+   ini.create("Section1");  //Also selects as current section
+   ini.create("Section2");  //Current
+
+   ini.set("Key1", "Value1");  //Added pair under section "Section2"
+
+   ini.select("Section1");  //Current
+   cout << ini.get("Key1", "-1") << endl;  //Returns "-1" as no key exists, no default will return NULL for data type, eg int() is 0
+
+   ini.select("Section2");
+   ini.set("Key1", "1.123");
+   cout << ini.get("Key1", -1.0) << endl;  //Return value as double
+   ini.set(123, 123);  //Will convert to provided INI data type for key/value, in this case string for both
+
+   ini.save();
+   ini.clear();
+   ini.parse();  //Parses file into objects in memory
+
+   cout << ini["Section2"]["Key1"] << endl;  //Returns "Value1", slightly more overhead involved seeking section, avoid using excessively
+
+   ///Iterate through sections and keys for both C++11 and C++98
+   centerString("########## Iterate Contents ##########");
+
+#ifdef FINI_CPP11
+   for(auto i: ini.sections)
+   {
+      cout << "[" << i.first << "]" << endl;
+
+      //for(auto j = i.second->begin(); j != i.second->end(); j++)
+      for(auto j: *i.second)
+      {
+         cout << " " << j.first << "=" << j.second << endl;
+      }
+   }
+#else
+   for(ini_t::sectionsit_t i = ini.sections.begin(); i != ini.sections.end(); i++)
+   {
+      //Section name as ini_t::section_t
+      cout << i->first << endl;
+
+      if (i->second->size() == 0)  //No keys/values in section, skip to next
+         continue;
+
+      for(ini_t::keysit_t j = i->second->begin(); j != i->second->end(); j++)
+      {
+         //Name as ini_t::key_t & Value as ini_t::key_t
+         cout << " " << j->first << "=" << j->second << endl;
+      }
+   }
+#endif
+
+///Example with different data types
+   typedef INI <unsigned char, string, float> ini_int_t;  //Makes things shorter/easier to write <Section, Key, Value>
+   ini_int_t ini_int("file_ints.ini", false);  //File to open/default save filename. The constuctor is set to parse by default, unless specified as false
+   for(int i = 1; i <= 200; i++)
+   {
+      ini_int.create(i); //Section
+      ini_int.set("Key", i / 2.f);
+   }
+
+   ini_int.save();
+
+///Wide char support example (please define FINI_WIDE_SUPPORT in project)
+   /*
+   ini_t ini_w("file.ini", true);
+   wcout << ini_w[L"Section2"][L"Key1"] << endl;
+   */
+
+///Load from memory
+   std::string str = getStringFromFile("config/test.ini"); //Allows us to tap into a source for the purpose of this example
+
+   ini_t ini_mem((void*)str.c_str(), str.size(), true); //This is the line which parses data from memory
+
+///Merge contents and keep values
+   ini_t inid("file.ini", true);
+   ini_t inis("merge.ini", true);
+   inid.merge(inis, true);
+   inid.save("merged.ini");
+
+   return EXIT_SUCCESS;
+}
+
+void centerString(string str)
+{
+   const char* s = str.c_str();
+   int l = strlen(s);
+   int pos = (int)((80 - l) / 2);
+   for(int i = 0; i < pos; i++)
+   cout << " ";
+   cout << s << endl;
+}
+
+std::string getStringFromFile(const std::string& path) {
+  std::ostringstream buf;
+  std::ifstream input (path.c_str());
+  buf << input.rdbuf();
+  return buf.str();
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file.ini b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file.ini
new file mode 100644
index 0000000000000000000000000000000000000000..e1c485ba2a657cf56d497a7aefc6e51daf0f0608
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file.ini
@@ -0,0 +1,5 @@
+[Section2]
+123=123
+Key1=1.123
+[Section Name]
+Key=Value
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file_ints.ini b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file_ints.ini
new file mode 100644
index 0000000000000000000000000000000000000000..3d71e76cae1ae33de74f9c0735021ea51e655b60
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/file_ints.ini
@@ -0,0 +1,400 @@
+[200]
+Key=100
+[199]
+Key=99.5
+[198]
+Key=99
+[197]
+Key=98.5
+[196]
+Key=98
+[195]
+Key=97.5
+[194]
+Key=97
+[193]
+Key=96.5
+[192]
+Key=96
+[191]
+Key=95.5
+[190]
+Key=95
+[189]
+Key=94.5
+[188]
+Key=94
+[187]
+Key=93.5
+[186]
+Key=93
+[185]
+Key=92.5
+[184]
+Key=92
+[183]
+Key=91.5
+[182]
+Key=91
+[181]
+Key=90.5
+[180]
+Key=90
+[179]
+Key=89.5
+[178]
+Key=89
+[177]
+Key=88.5
+[176]
+Key=88
+[175]
+Key=87.5
+[174]
+Key=87
+[173]
+Key=86.5
+[172]
+Key=86
+[171]
+Key=85.5
+[170]
+Key=85
+[169]
+Key=84.5
+[168]
+Key=84
+[167]
+Key=83.5
+[166]
+Key=83
+[165]
+Key=82.5
+[164]
+Key=82
+[163]
+Key=81.5
+[162]
+Key=81
+[161]
+Key=80.5
+[160]
+Key=80
+[159]
+Key=79.5
+[158]
+Key=79
+[157]
+Key=78.5
+[156]
+Key=78
+[155]
+Key=77.5
+[154]
+Key=77
+[153]
+Key=76.5
+[152]
+Key=76
+[151]
+Key=75.5
+[150]
+Key=75
+[149]
+Key=74.5
+[148]
+Key=74
+[147]
+Key=73.5
+[146]
+Key=73
+[145]
+Key=72.5
+[144]
+Key=72
+[143]
+Key=71.5
+[142]
+Key=71
+[141]
+Key=70.5
+[140]
+Key=70
+[139]
+Key=69.5
+[138]
+Key=69
+[137]
+Key=68.5
+[136]
+Key=68
+[135]
+Key=67.5
+[134]
+Key=67
+[133]
+Key=66.5
+[132]
+Key=66
+[131]
+Key=65.5
+[130]
+Key=65
+[129]
+Key=64.5
+[128]
+Key=64
+[127]
+Key=63.5
+[126]
+Key=63
+[125]
+Key=62.5
+[124]
+Key=62
+[123]
+Key=61.5
+[122]
+Key=61
+[121]
+Key=60.5
+[120]
+Key=60
+[119]
+Key=59.5
+[118]
+Key=59
+[117]
+Key=58.5
+[116]
+Key=58
+[115]
+Key=57.5
+[114]
+Key=57
+[113]
+Key=56.5
+[112]
+Key=56
+[111]
+Key=55.5
+[110]
+Key=55
+[109]
+Key=54.5
+[108]
+Key=54
+[107]
+Key=53.5
+[106]
+Key=53
+[105]
+Key=52.5
+[104]
+Key=52
+[103]
+Key=51.5
+[1]
+Key=0.5
+[2]
+Key=1
+[3]
+Key=1.5
+[4]
+Key=2
+[5]
+Key=2.5
+[6]
+Key=3
+[7]
+Key=3.5
+[8]
+Key=4
+[9]
+Key=4.5
+[10]
+Key=5
+[11]
+Key=5.5
+[12]
+Key=6
+[13]
+Key=6.5
+[14]
+Key=7
+[15]
+Key=7.5
+[16]
+Key=8
+[17]
+Key=8.5
+[18]
+Key=9
+[19]
+Key=9.5
+[20]
+Key=10
+[21]
+Key=10.5
+[22]
+Key=11
+[23]
+Key=11.5
+[24]
+Key=12
+[25]
+Key=12.5
+[26]
+Key=13
+[27]
+Key=13.5
+[28]
+Key=14
+[29]
+Key=14.5
+[30]
+Key=15
+[31]
+Key=15.5
+[32]
+Key=16
+[33]
+Key=16.5
+[34]
+Key=17
+[35]
+Key=17.5
+[36]
+Key=18
+[37]
+Key=18.5
+[38]
+Key=19
+[39]
+Key=19.5
+[40]
+Key=20
+[41]
+Key=20.5
+[42]
+Key=21
+[43]
+Key=21.5
+[44]
+Key=22
+[45]
+Key=22.5
+[46]
+Key=23
+[47]
+Key=23.5
+[48]
+Key=24
+[49]
+Key=24.5
+[50]
+Key=25
+[51]
+Key=25.5
+[52]
+Key=26
+[53]
+Key=26.5
+[54]
+Key=27
+[55]
+Key=27.5
+[56]
+Key=28
+[57]
+Key=28.5
+[58]
+Key=29
+[59]
+Key=29.5
+[60]
+Key=30
+[61]
+Key=30.5
+[62]
+Key=31
+[63]
+Key=31.5
+[64]
+Key=32
+[65]
+Key=32.5
+[66]
+Key=33
+[67]
+Key=33.5
+[68]
+Key=34
+[69]
+Key=34.5
+[70]
+Key=35
+[71]
+Key=35.5
+[72]
+Key=36
+[73]
+Key=36.5
+[74]
+Key=37
+[75]
+Key=37.5
+[76]
+Key=38
+[77]
+Key=38.5
+[78]
+Key=39
+[79]
+Key=39.5
+[80]
+Key=40
+[81]
+Key=40.5
+[82]
+Key=41
+[83]
+Key=41.5
+[84]
+Key=42
+[85]
+Key=42.5
+[86]
+Key=43
+[87]
+Key=43.5
+[88]
+Key=44
+[89]
+Key=44.5
+[90]
+Key=45
+[91]
+Key=45.5
+[92]
+Key=46
+[93]
+Key=46.5
+[94]
+Key=47
+[95]
+Key=47.5
+[96]
+Key=48
+[97]
+Key=48.5
+[98]
+Key=49
+[99]
+Key=49.5
+[100]
+Key=50
+[101]
+Key=50.5
+[102]
+Key=51
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/merge.ini b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/merge.ini
new file mode 100644
index 0000000000000000000000000000000000000000..dfdc38108414680c510f65309feed47bf3e6c4d5
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/merge.ini
@@ -0,0 +1,5 @@
+[NewSection]
+Key=Value
+[Section2]
+NewKey=Value
+123=456
\ No newline at end of file
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.cbp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.cbp
new file mode 100644
index 0000000000000000000000000000000000000000..913928a1159426daa67f8f0b6cfaa71596d6ca1f
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.cbp
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="project" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="gcc_mingw">
+				<Option output="bin/gcc_mingw/example" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/gcc_mingw/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-std=c++0x" />
+				</Compiler>
+			</Target>
+			<Target title="vs_2013">
+				<Option output="bin/vs/example" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/vs_2013/" />
+				<Option type="1" />
+				<Option compiler="microsoft_visual_c_2013" />
+				<Compiler>
+					<Add option="/EHa" />
+					<Add option="/W2" />
+					<Add directory="C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/include" />
+				</Compiler>
+				<Linker>
+					<Add directory="C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/lib" />
+					<Add directory="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" />
+				</Linker>
+			</Target>
+			<Target title="vs_2010">
+				<Option output="bin/vs/example" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/vs_2010/" />
+				<Option type="1" />
+				<Option compiler="msvc10" />
+				<Compiler>
+					<Add option="/EHa" />
+					<Add option="/W2" />
+				</Compiler>
+				<Linker>
+					<Add directory="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" />
+				</Linker>
+			</Target>
+		</Build>
+		<Unit filename="../INI.h" />
+		<Unit filename="example.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.depend b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.depend
new file mode 100644
index 0000000000000000000000000000000000000000..02c743092d1328388f1f3db9b6b14c7dc2ac01bb
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/cpp-feather-ini-parser/example/project.depend
@@ -0,0 +1,802 @@
+# depslib dependency file v1.0
+1399614205 source:d:\projects\feather-ini-parser\example\example.cpp
+	<iostream>
+	<cstring>
+	<stdint.h>
+	"../INI.h"
+
+1399625159 d:\projects\feather-ini-parser\ini.h
+	<string>
+	<fstream>
+	<sstream>
+	<stdint.h>
+	<stdio.h>
+	<stdlib.h>
+	<unordered_map>
+	<map>
+	<wchar.h>
+	<cstring>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\iostream
+	<istream>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\istream
+	<ostream>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\ostream
+	<ios>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\ios
+	<xlocnum>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xlocnum
+	<climits>
+	<cmath>
+	<cstdio>
+	<cstdlib>
+	<streambuf>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\climits
+	<yvals.h>
+	<limits.h>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\yvals.h
+	<xkeycheck.h>
+	<crtdefs.h>
+	<use_ansi.h>
+	<crtwrn.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xkeycheck.h
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\crtdefs.h
+	<sal.h>
+	<vadefs.h>
+	<winapifamily.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\sal.h
+	"codeanalysis\sourceannotations.h"
+	<ConcurrencySal.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\codeanalysis\sourceannotations.h
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\concurrencysal.h
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\vadefs.h
+	<cruntime.h>
+
+1379495880 c:\program files (x86)\microsoft visual studio 12.0\vc\include\use_ansi.h
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\crtwrn.h
+	<crtdefs.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\limits.h
+	<crtdefs.h>
+
+1375351090 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cmath
+	<yvals.h>
+	<math.h>
+	<xtgmath.h>
+	<math.h>
+	<xtgmath.h>
+
+1379495880 c:\program files (x86)\microsoft visual studio 12.0\vc\include\math.h
+	<crtdefs.h>
+
+1379495880 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xtgmath.h
+	<xtr1common>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xtr1common
+	<yvals.h>
+
+1375351090 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cstdio
+	<yvals.h>
+	<stdio.h>
+	<stdio.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\stdio.h
+	<crtdefs.h>
+	<swprintf.inl>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\swprintf.inl
+	<vadefs.h>
+
+1375351090 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cstdlib
+	<yvals.h>
+	<stdlib.h>
+	<stdlib.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\stdlib.h
+	<crtdefs.h>
+	<limits.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\streambuf
+	<xiosbase>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xiosbase
+	<xlocale>
+	<system_error>
+	<share.h>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xlocale
+	<climits>
+	<cstring>
+	<stdexcept>
+	<typeinfo>
+	<xlocinfo>
+	<xdebug>
+	<xfacet>
+
+1375351090 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cstring
+	<yvals.h>
+	<string.h>
+	<string.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\string.h
+	<crtdefs.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\stdexcept
+	<exception>
+	<xstring>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\exception
+	<xstddef>
+	<eh.h>
+	<malloc.h>
+	<string.h>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xstddef
+	<stdlib.h>
+	<cstddef>
+	<initializer_list>
+	<xtr1common>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cstddef
+	<yvals.h>
+	<stddef.h>
+	<stddef.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\stddef.h
+	<crtdefs.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\initializer_list
+	<cstddef>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\eh.h
+	<crtdefs.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\malloc.h
+	<crtdefs.h>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xstring
+	<xmemory0>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xmemory0
+	<cstdlib>
+	<limits>
+	<new>
+	<xutility>
+	<xatomic0.h>
+	<intrin.h>
+	<xatomic.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\limits
+	<ymath.h>
+	<cfloat>
+	<climits>
+	<cmath>
+	<cwchar>
+	<xstddef>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\ymath.h
+	<yvals.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cfloat
+	<yvals.h>
+	<float.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\float.h
+	<crtdefs.h>
+	<crtwrn.h>
+
+1375351090 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cwchar
+	<yvals.h>
+	<wchar.h>
+	<wchar.h>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\wchar.h
+	<crtdefs.h>
+	<swprintf.inl>
+	<wtime.inl>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\wtime.inl
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\new
+	<exception>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xutility
+	<climits>
+	<cstdlib>
+	<utility>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\utility
+	<xstddef>
+	<iosfwd>
+	<type_traits>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\iosfwd
+	<cstdio>
+	<cstring>
+	<cwchar>
+	<xstddef>
+	<crtdbg.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\crtdbg.h
+	<crtdefs.h>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\type_traits
+	<xstddef>
+	<xrefwrap>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xrefwrap
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xatomic0.h
+	<yvals.h>
+
+1379495880 c:\program files (x86)\microsoft visual studio 12.0\vc\include\intrin.h
+	<crtdefs.h>
+	<setjmp.h>
+	<stddef.h>
+	<immintrin.h>
+	<ammintrin.h>
+	<mm3dnow.h>
+	<armintr.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\setjmp.h
+	<crtdefs.h>
+	<setjmpex.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\setjmpex.h
+	<setjmp.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\immintrin.h
+	<wmmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\wmmintrin.h
+	<nmmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\nmmintrin.h
+	<smmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\smmintrin.h
+	<tmmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\tmmintrin.h
+	<pmmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\pmmintrin.h
+	<emmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\emmintrin.h
+	<xmmintrin.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xmmintrin.h
+	<mmintrin.h>
+	"xmm_func.h"
+	<malloc.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\mmintrin.h
+	<crtdefs.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\ammintrin.h
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\mm3dnow.h
+	<crtdefs.h>
+	<mmintrin.h>
+	<xmmintrin.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\armintr.h
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xatomic.h
+	<xatomic0.h>
+	<stddef.h>
+	<stdlib.h>
+	<string.h>
+	<intrin.h>
+	<xutility>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\typeinfo
+	<xstddef>
+	<string.h>
+	<exception>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xlocinfo
+	<xlocinfo.h>
+	<cstdlib>
+	<xstddef>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xlocinfo.h
+	<ctype.h>
+	<locale.h>
+	<wchar.h>
+	<yvals.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\ctype.h
+	<crtdefs.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\locale.h
+	<crtdefs.h>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xdebug
+	<yvals.h>
+	<crtdbg.h>
+	<xmemory>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xmemory
+	<xmemory0>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xfacet
+	<yvals.h>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\system_error
+	<cerrno>
+	<cstdlib>
+	<stdexcept>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\cerrno
+	<yvals.h>
+	<errno.h>
+	<errno.h>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\errno.h
+	<crtdefs.h>
+
+1374412934 c:\program files (x86)\microsoft visual studio 12.0\vc\include\share.h
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\stdint.h
+	<crtdefs.h>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\string
+	<iterator>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\iterator
+	<istream>
+	<xutility>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\fstream
+	<istream>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\sstream
+	<string>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\unordered_map
+	<xhash>
+	<tuple>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xhash
+	<cstring>
+	<cwchar>
+	<list>
+	<vector>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\list
+	<xmemory>
+	<stdexcept>
+
+1374410776 c:\program files (x86)\microsoft visual studio 12.0\vc\include\vector
+	<xmemory>
+	<stdexcept>
+
+1374412938 c:\program files (x86)\microsoft visual studio 12.0\vc\include\tuple
+	<type_traits>
+	<xutility>
+	<new>
+
+1374412936 c:\program files (x86)\microsoft visual studio 12.0\vc\include\map
+	<xtree>
+	<tuple>
+
+1374726946 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xtree
+	<xmemory>
+	<stdexcept>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\iostream
+	<istream>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\istream
+	<ostream>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\ostream
+	<ios>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\ios
+	<xlocnum>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xlocnum
+	<climits>
+	<cmath>
+	<cstdio>
+	<cstdlib>
+	<streambuf>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\climits
+	<yvals.h>
+	<limits.h>
+
+1258271576 c:\program files (x86)\microsoft visual studio 10.0\vc\include\yvals.h
+	<crtdefs.h>
+	<xkeycheck.h>
+	<crtwrn.h>
+	<use_ansi.h>
+	<crtwrn.h>
+	<crtwrn.h>
+
+1260264954 c:\program files (x86)\microsoft visual studio 10.0\vc\include\crtdefs.h
+	<sal.h>
+	<vadefs.h>
+
+1263987576 c:\program files (x86)\microsoft visual studio 10.0\vc\include\sal.h
+	"codeanalysis\sourceannotations.h"
+
+1263303828 c:\program files (x86)\microsoft visual studio 10.0\vc\include\codeanalysis\sourceannotations.h
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\vadefs.h
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xkeycheck.h
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\crtwrn.h
+	<crtdefs.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\use_ansi.h
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\limits.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cmath
+	<yvals.h>
+	<math.h>
+	<math.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\math.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cstdio
+	<yvals.h>
+	<stdio.h>
+	<stdio.h>
+
+1257335008 c:\program files (x86)\microsoft visual studio 10.0\vc\include\stdio.h
+	<crtdefs.h>
+	<swprintf.inl>
+
+1256197836 c:\program files (x86)\microsoft visual studio 10.0\vc\include\swprintf.inl
+	<vadefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cstdlib
+	<yvals.h>
+	<stdlib.h>
+	<stdlib.h>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\stdlib.h
+	<crtdefs.h>
+	<limits.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\streambuf
+	<xiosbase>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xiosbase
+	<xlocale>
+	<system_error>
+	<share.h>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xlocale
+	<climits>
+	<cstring>
+	<stdexcept>
+	<typeinfo>
+	<xlocinfo>
+	<xdebug>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cstring
+	<yvals.h>
+	<string.h>
+	<string.h>
+
+1260264954 c:\program files (x86)\microsoft visual studio 10.0\vc\include\string.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\stdexcept
+	<exception>
+	<xstring>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\exception
+	<xstddef>
+	<eh.h>
+	<malloc.h>
+	<string.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xstddef
+	<yvals.h>
+	<cstddef>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cstddef
+	<yvals.h>
+	<stddef.h>
+	<stddef.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\stddef.h
+	<crtdefs.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\eh.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\malloc.h
+	<crtdefs.h>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xstring
+	<xmemory>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xmemory
+	<cstdlib>
+	<new>
+	<xutility>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\new
+	<exception>
+
+1258271576 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xutility
+	<climits>
+	<cstdlib>
+	<utility>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\utility
+	<xstddef>
+	<iosfwd>
+	<type_traits>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\iosfwd
+	<cstdio>
+	<cstring>
+	<cwchar>
+	<xstddef>
+	<crtdbg.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cwchar
+	<yvals.h>
+	<wchar.h>
+	<wchar.h>
+
+1257335008 c:\program files (x86)\microsoft visual studio 10.0\vc\include\wchar.h
+	<crtdefs.h>
+	<swprintf.inl>
+	<wtime.inl>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\wtime.inl
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\crtdbg.h
+	<crtdefs.h>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\type_traits
+	<limits>
+	<xtr1common>
+	<xfwrap>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\limits
+	<ymath.h>
+	<cfloat>
+	<climits>
+	<cmath>
+	<cwchar>
+	<xstddef>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\ymath.h
+	<yvals.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cfloat
+	<yvals.h>
+	<float.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\float.h
+	<crtdefs.h>
+	<crtwrn.h>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xtr1common
+	<yvals.h>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xfwrap
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+	<xfwrap1>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xfwrap1
+	<xxbind1>
+	<xxcallfun>
+	<xxcallobj>
+	<xxcallpmf>
+	<xxfunction>
+	<xxmem_fn>
+	<xxpmfcaller>
+	<xxrefwrap>
+	<xxresult>
+	<xxshared>
+	<xxtuple0>
+	<xxtuple1>
+	<xxtype_traits>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxbind1
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxcallfun
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxcallobj
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxcallpmf
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxfunction
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxmem_fn
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxpmfcaller
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxrefwrap
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxresult
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxshared
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxtuple0
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxtuple1
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xxtype_traits
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\typeinfo
+	<xstddef>
+	<string.h>
+	<exception>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xlocinfo
+	<xlocinfo.h>
+	<cstdlib>
+	<xstddef>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xlocinfo.h
+	<ctype.h>
+	<locale.h>
+	<wchar.h>
+	<yvals.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\ctype.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\locale.h
+	<crtdefs.h>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xdebug
+	<yvals.h>
+	<crtdbg.h>
+	<xmemory>
+
+1260264954 c:\program files (x86)\microsoft visual studio 10.0\vc\include\system_error
+	<cerrno>
+	<cstdlib>
+	<stdexcept>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\cerrno
+	<yvals.h>
+	<errno.h>
+	<errno.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\errno.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\share.h
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\stdint.h
+	<yvals.h>
+
+1257671184 c:\program files (x86)\microsoft visual studio 10.0\vc\include\string
+	<istream>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\fstream
+	<istream>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\sstream
+	<string>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\unordered_map
+	<xhash>
+
+1263720180 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xhash
+	<cstring>
+	<cwchar>
+	<xfunctional>
+	<list>
+	<vector>
+
+1251647994 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xfunctional
+	<cstdlib>
+	<xstring>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\list
+	<xfunctional>
+	<memory>
+	<stdexcept>
+
+1267607544 c:\program files (x86)\microsoft visual studio 10.0\vc\include\memory
+	<xmemory>
+	<exception>
+	<typeinfo>
+	<type_traits>
+	<intrin.h>
+	<xfwrap>
+	<xfwrap>
+	<xfwrap>
+
+1263118342 c:\program files (x86)\microsoft visual studio 10.0\vc\include\intrin.h
+	<crtdefs.h>
+	<setjmp.h>
+	<stddef.h>
+	<immintrin.h>
+	<mm3dnow.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\setjmp.h
+	<crtdefs.h>
+	<setjmpex.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\setjmpex.h
+	<setjmp.h>
+
+1251647992 c:\program files (x86)\microsoft visual studio 10.0\vc\include\immintrin.h
+	<wmmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\wmmintrin.h
+	<nmmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\nmmintrin.h
+	<smmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\smmintrin.h
+	<tmmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\tmmintrin.h
+	<pmmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\pmmintrin.h
+	<emmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\emmintrin.h
+	<xmmintrin.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xmmintrin.h
+	<mmintrin.h>
+	"xmm_func.h"
+	<malloc.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\mmintrin.h
+	<crtdefs.h>
+
+1251642866 c:\program files (x86)\microsoft visual studio 10.0\vc\include\mm3dnow.h
+	<crtdefs.h>
+	<mmintrin.h>
+	<xmmintrin.h>
+
+1258271576 c:\program files (x86)\microsoft visual studio 10.0\vc\include\vector
+	<memory>
+	<stdexcept>
+	<xfunctional>
+
+1254299028 c:\program files (x86)\microsoft visual studio 10.0\vc\include\map
+	<xtree>
+
+1258271576 c:\program files (x86)\microsoft visual studio 10.0\vc\include\xtree
+	<xfunctional>
+	<memory>
+	<stdexcept>
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lms7002_defines.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lms7002_defines.h
new file mode 100644
index 0000000000000000000000000000000000000000..6b06a51c7eda7c8add40ccfe19f60adde64b4053
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lms7002_defines.h
@@ -0,0 +1,218 @@
+/**
+@file	lms7002_defines.h
+@author Lime Microsystems
+@brief	enumerations of available LMS7002M commands and statuses
+*/
+#pragma once
+
+const int LMS_RST_DEACTIVATE = 0;
+const int LMS_RST_ACTIVATE = 1;
+const int LMS_RST_PULSE = 2;
+
+enum eLMS_DEV
+{
+	LMS_DEV_UNKNOWN,
+	LMS_DEV_EVB6,
+	LMS_DEV_DIGIGREEN,
+	LMS_DEV_DIGIRED,
+	LMS_DEV_EVB7,
+	LMS_DEV_ZIPPER,
+	LMS_DEV_SOCKETBOARD,
+	LMS_DEV_EVB7V2,
+	LMS_DEV_STREAM,
+	LMS_DEV_NOVENA,
+	LMS_DEV_DATASPARK,
+	LMS_DEV_RFSPARK,
+	LMS_DEV_LMS6002USB,
+	LMS_DEV_RFESPARK,
+	LMS_DEV_SODERA,
+	
+	LMS_DEV_COUNT
+};
+
+const char LMS_DEV_NAMES[][80] = 
+{
+	"UNKNOWN",
+	"EVB6",
+	"DigiGreen",
+	"DigiRed",
+	"EVB7",
+	"ZIPPER",
+	"Socket Board",
+	"EVB7_v2",
+	"Stream",
+	"Novena",
+	"DataSpark",
+	"RF-Spark",
+	"LMS6002-USB Stick",
+	"RF-ESpark",
+	"SoDeRa",
+};
+
+static const char* GetDeviceName(const eLMS_DEV device)
+{
+    if (LMS_DEV_UNKNOWN < device && device < LMS_DEV_COUNT)
+        return LMS_DEV_NAMES[device];
+    else
+        return LMS_DEV_NAMES[LMS_DEV_UNKNOWN];
+}
+
+enum eEXP_BOARD 
+{
+	EXP_BOARD_UNKNOWN,
+	EXP_BOARD_UNSUPPORTED,
+	EXP_BOARD_NO,
+	EXP_BOARD_MYRIAD1,
+	EXP_BOARD_MYRIAD2,
+	EXP_BOARD_MYRIAD_NOVENA,
+	EXP_BOARD_HPM1000,
+	EXP_BOARD_MYRIAD7,
+	EXP_BOARD_HPM7,
+	
+	EXP_BOARD_COUNT
+};
+
+const char EXP_BOARD_NAMES[][80] = 
+{
+	"UNKNOWN", 
+	"UNSUPPORTED", 
+	"NOT AVAILABLE",
+	"Myriad1",
+	"Myriad2",
+	"Novena",
+	"HPM1000",
+	"Myriad7",
+	"HMP7"
+};
+
+static const char* GetExpansionBoardName(const eEXP_BOARD board)
+{
+    if (EXP_BOARD_UNKNOWN < board && board < EXP_BOARD_COUNT)
+        return EXP_BOARD_NAMES[board];
+    else
+        return EXP_BOARD_NAMES[EXP_BOARD_UNKNOWN];
+}
+			
+struct LMS64C_Info
+{
+	unsigned char firmware;
+    unsigned char deviceType;
+    unsigned char protocol;
+    unsigned char hardware;
+    unsigned char expansionBoard;
+};
+
+enum eCMD_LMS
+{
+    CMD_GET_INFO = 0x00,
+    CMD_LMS6002_RST = 0x10,
+    ///Writes data to SI5356 synthesizer via I2C
+    CMD_SI5356_WR = 0x11,
+    ///Reads data from SI5356 synthesizer via I2C
+    CMD_SI5356_RD = 0x12,
+    ///Writes data to SI5351 synthesizer via I2C
+    CMD_SI5351_WR = 0x13,
+    ///Reads data from SI5351 synthesizer via I2C
+    CMD_SI5351_RD = 0x14,
+    ///PanelBus DVI (HDMI) Transmitter control
+    CMD_TFP410_WR = 0x15,
+    ///PanelBus DVI (HDMI) Transmitter control
+    CMD_TFP410_RD = 0x16,
+    ///Sets new LMS7002M chip’s RESET pin level (0, 1, pulse)
+    CMD_LMS7002_RST = 0x20,
+    ///Writes data to LMS7002M chip via SPI
+    CMD_LMS7002_WR = 0x21,
+    ///Reads data from LMS7002M chip via SPI
+    CMD_LMS7002_RD = 0x22,
+    ///Writes data to LMS6002 chip via SPI
+    CMD_LMS6002_WR = 0x23,
+    ///Reads data from LMS6002 chip via SPI
+    CMD_LMS6002_RD = 0x24,
+
+    CMD_LMS_LNA = 0x2A,
+    CMD_LMS_PA = 0x2B,
+
+    CMD_PROG_MCU = 0x2C,
+    ///Writes data to ADF4002 chip via SPI
+    CMD_ADF4002_WR = 0x31,
+
+    CMD_USB_FIFO_RST = 0x40,
+    CMD_PE636040_WR = 0x41,
+	CMD_PE636040_RD = 0x42,
+
+	CMD_GPIO_WR = 0x51,
+	CMD_GPIO_RD = 0x52,
+
+	CMD_ALTERA_FPGA_GW_WR = 0x53,
+	CMD_ALTERA_FPGA_GW_RD = 0x54,
+
+	CMD_BRDSPI_WR = 0x55,//16 bit spi for stream, dataspark control
+    CMD_BRDSPI_RD = 0x56,//16 bit spi for stream, dataspark control
+	CMD_BRDSPI8_WR = 0x57, //8 + 8 bit spi for stream, dataspark control
+	CMD_BRDSPI8_RD = 0x58, //8 + 8 bit spi for stream, dataspark control
+	
+	CMD_BRDCONF_WR = 0x5D, //write config data to board
+	CMD_BRDCONF_RD = 0x5E, //read config data from board
+	
+	CMD_ANALOG_VAL_WR = 0x61, //write analog value
+	CMD_ANALOG_VAL_RD = 0x62, //read analog value
+
+	CMD_MYRIAD_RST = 0x80,
+	CMD_MYRIAD_WR = 0x81,
+	CMD_MYRIAD_RD = 0x82,
+	CMD_MYRIAD_PROG = 0x8C
+};
+
+enum eCMD_STATUS
+{
+    STATUS_UNDEFINED,
+    STATUS_COMPLETED_CMD,
+    STATUS_UNKNOWN_CMD,
+    STATUS_BUSY_CMD,
+    STATUS_MANY_BLOCKS_CMD,
+    STATUS_ERROR_CMD,
+    STATUS_WRONG_ORDER_CMD,
+	STATUS_RESOURCE_DENIED_CMD,
+    STATUS_COUNT
+};
+
+static const char  status_text[][32]=
+{
+    "Undefined/Failure",
+    "Completed",
+    "Unknown command",
+    "Busy",
+    "Too many blocks",
+    "Error",
+    "Wrong order",
+    "Resource denied"
+};
+
+static const char* status2string(const int status)
+{
+    if(status >= 0 && status < STATUS_COUNT)
+        return status_text[status];
+    else
+        return "Unknown status";
+}
+
+enum eADC_UNITS
+{
+	RAW,
+	VOLTAGE,
+	CURRENT,
+	RESISTANCE,
+	POWER,
+	TEMPERATURE,
+	ADC_UNITS_COUNT
+};
+
+static const char  adc_units_text[][8] = {"", "V", "A", "Ohm", "W", "C"};
+
+static const char* adcUnits2string(const unsigned units)
+{
+	if (units < ADC_UNITS_COUNT)
+		return adc_units_text[units];
+	else
+		return " unknown";
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5b74ef8975782a56f4c386714a48431e78ff2a1a
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.cpp
@@ -0,0 +1,326 @@
+/**
+@file   LMScomms.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief  Implementation of data transmission to LMS boards
+*/
+
+#include "lmsComms.h"
+
+LMScomms::LMScomms()
+{
+    callback_logData = nullptr;
+    unsigned short test = 0x1234;
+    unsigned char* bytes = (unsigned char*)&test;
+    if(bytes[0] == 0x12 && bytes[1] == 0x34)
+        mSystemBigEndian = true;
+    else
+        mSystemBigEndian = false;
+}
+
+LMScomms::~LMScomms()
+{
+}
+
+/** @brief Transfers data between packet and connected device
+    @param pkt packet containing output data and to receive incomming data
+    @return 0: success, other: failure
+*/
+LMScomms::TransferStatus LMScomms::TransferPacket(GenericPacket& pkt)
+{
+    std::lock_guard<std::mutex> lock(mControlPortLock);
+	TransferStatus status = TRANSFER_SUCCESS;
+    if(IsOpen() == false)
+        return NOT_CONNECTED;
+
+    int packetLen;
+    eLMS_PROTOCOL protocol = LMS_PROTOCOL_UNDEFINED;
+    if(activeControlPort->GetType() == IConnection::SPI_PORT)
+        protocol = LMS_PROTOCOL_NOVENA;
+    else
+        protocol = LMS_PROTOCOL_LMS64C;
+    switch(protocol)
+    {
+    case LMS_PROTOCOL_UNDEFINED:
+        return TRANSFER_FAILED;
+    case LMS_PROTOCOL_LMS64C:
+        packetLen = ProtocolLMS64C::pktLength;
+        break;
+    case LMS_PROTOCOL_NOVENA:
+        packetLen = pkt.outBuffer.size() > ProtocolNovena::pktLength ? ProtocolNovena::pktLength : pkt.outBuffer.size();
+        break;
+    default:
+        packetLen = 0;
+        return TRANSFER_FAILED;
+    }
+    int outLen = 0;
+    unsigned char* outBuffer = NULL;
+    outBuffer = PreparePacket(pkt, outLen, protocol);
+    unsigned char* inBuffer = new unsigned char[outLen];
+    memset(inBuffer, 0, outLen);
+
+    int outBufPos = 0;
+    int inDataPos = 0;
+    if(outLen == 0)
+    {
+        //printf("packet outlen = 0\n");
+        outLen = 1;
+    }
+
+    if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        bool transferData = true; //some commands are fake, so don't need transferring
+        if(pkt.cmd == CMD_GET_INFO)
+        {
+            //spi does not have GET INFO, fake it to inform what device it is
+            pkt.status = STATUS_COMPLETED_CMD;
+            pkt.inBuffer.clear();
+            pkt.inBuffer.resize(64, 0);
+            pkt.inBuffer[0] = 0; //firmware
+            pkt.inBuffer[1] = LMS_DEV_NOVENA; //device
+            pkt.inBuffer[2] = 0; //protocol
+            pkt.inBuffer[3] = 0; //hardware
+            pkt.inBuffer[4] = EXP_BOARD_UNSUPPORTED; //expansion
+            transferData = false;
+        }
+
+        if(transferData)
+        {
+            if (callback_logData)
+                callback_logData(true, outBuffer, outLen);
+            int bytesWritten = Write(outBuffer, outLen);
+            if( bytesWritten == outLen)
+            {
+                if(pkt.cmd == CMD_LMS7002_RD)
+                {
+                    inDataPos = Read(&inBuffer[inDataPos], outLen);
+                    if(inDataPos != outLen)
+                        status = TRANSFER_FAILED;
+                    else
+                    {
+                        if (callback_logData)
+                            callback_logData(false, inBuffer, inDataPos);
+                    }
+                }
+                ParsePacket(pkt, inBuffer, inDataPos, protocol);
+            }
+            else
+                status = TRANSFER_FAILED;
+        }
+    }
+    else
+    {
+        for(int i=0; i<outLen; i+=packetLen)
+        {
+            int bytesToSend = packetLen;
+            if (callback_logData)
+                callback_logData(true, &outBuffer[outBufPos], bytesToSend);
+            if( Write(&outBuffer[outBufPos], bytesToSend) )
+            {
+                outBufPos += packetLen;
+                long readLen = packetLen;
+                int bread = Read(&inBuffer[inDataPos], readLen);
+                if(bread != readLen && protocol != LMS_PROTOCOL_NOVENA)
+                {
+                    status = TRANSFER_FAILED;
+                    break;
+                }
+                if (callback_logData)
+                    callback_logData(false, &inBuffer[inDataPos], bread);
+                inDataPos += bread;
+            }
+            else
+            {
+                status = TRANSFER_FAILED;
+                break;
+            }
+        }
+        ParsePacket(pkt, inBuffer, inDataPos, protocol);
+    }
+    delete outBuffer;
+    delete inBuffer;
+    return status;
+}
+
+/** @brief Returns connected device information
+*/
+LMSinfo LMScomms::GetInfo()
+{
+    LMSinfo info;
+    info.device = LMS_DEV_UNKNOWN;
+    info.expansion = EXP_BOARD_UNKNOWN;
+    info.firmware = 0;
+    info.hardware = 0;
+    info.protocol = 0;
+    GenericPacket pkt;
+    pkt.cmd = CMD_GET_INFO;
+    LMScomms::TransferStatus status = TransferPacket(pkt);
+    if (status == LMScomms::TRANSFER_SUCCESS && pkt.inBuffer.size() >= 5)
+    {
+        info.firmware = pkt.inBuffer[0];
+        info.device = pkt.inBuffer[1] < LMS_DEV_COUNT ? (eLMS_DEV)pkt.inBuffer[1] : LMS_DEV_UNKNOWN;
+        info.protocol = pkt.inBuffer[2];
+        info.hardware = pkt.inBuffer[3];
+        info.expansion = pkt.inBuffer[4] < EXP_BOARD_COUNT ? (eEXP_BOARD)pkt.inBuffer[4] : EXP_BOARD_UNKNOWN;
+    }
+    return info;
+}
+
+/** @brief Takes generic packet and converts to specific protocol buffer
+    @param pkt generic data packet to convert
+    @param length returns length of returned buffer
+    @param protocol which protocol to use for data
+    @return pointer to data buffer, must be manually deleted after use
+*/
+unsigned char* LMScomms::PreparePacket(const GenericPacket& pkt, int& length, const eLMS_PROTOCOL protocol)
+{
+    unsigned char* buffer = NULL;
+    if(protocol == LMS_PROTOCOL_UNDEFINED)
+        return NULL;
+
+    if(protocol == LMS_PROTOCOL_LMS64C)
+    {
+        ProtocolLMS64C packet;
+        int maxDataLength = packet.maxDataLength;
+        packet.cmd = pkt.cmd;
+        packet.status = pkt.status;
+        int byteBlockRatio = 1; //block ratio - how many bytes in one block
+        switch( packet.cmd )
+        {
+        case CMD_PROG_MCU:
+        case CMD_GET_INFO:
+        case CMD_SI5351_RD:
+        case CMD_SI5356_RD:
+            byteBlockRatio = 1;
+            break;
+        case CMD_SI5351_WR:
+        case CMD_SI5356_WR:
+            byteBlockRatio = 2;
+            break;
+        case CMD_LMS7002_RD:
+        case CMD_BRDSPI_RD:
+        case CMD_BRDSPI8_RD:
+            byteBlockRatio = 2;
+            break;
+        case CMD_ADF4002_WR:
+            byteBlockRatio = 3;
+            break;
+        case CMD_LMS7002_WR:
+        case CMD_BRDSPI_WR:
+        case CMD_ANALOG_VAL_WR:
+            byteBlockRatio = 4;
+            break;
+        default:
+            byteBlockRatio = 1;
+        }
+        if (packet.cmd == CMD_LMS7002_RD || packet.cmd == CMD_BRDSPI_RD)
+            maxDataLength = maxDataLength/2;
+        if (packet.cmd == CMD_ANALOG_VAL_RD)
+            maxDataLength = maxDataLength / 4;
+        int blockCount = pkt.outBuffer.size()/byteBlockRatio;
+        int bufLen = blockCount/(maxDataLength/byteBlockRatio)
+                    +(blockCount%(maxDataLength/byteBlockRatio)!=0);
+        bufLen *= packet.pktLength;
+        if(bufLen == 0)
+            bufLen = packet.pktLength;
+        buffer = new unsigned char[bufLen];
+        memset(buffer, 0, bufLen);
+        int srcPos = 0;
+        for(int j=0; j*packet.pktLength<bufLen; ++j)
+        {
+            int pktPos = j*packet.pktLength;
+            buffer[pktPos] = packet.cmd;
+            buffer[pktPos+1] = packet.status;
+            if(blockCount > (maxDataLength/byteBlockRatio))
+            {
+                buffer[pktPos+2] = maxDataLength/byteBlockRatio;
+                blockCount -= buffer[pktPos+2];
+            }
+            else
+                buffer[pktPos+2] = blockCount;
+            memcpy(&buffer[pktPos+3], packet.reserved, sizeof(packet.reserved));
+            int bytesToPack = (maxDataLength/byteBlockRatio)*byteBlockRatio;
+            for (int k = 0; k<bytesToPack && srcPos < pkt.outBuffer.size(); ++srcPos, ++k)
+                buffer[pktPos + 8 + k] = pkt.outBuffer[srcPos];
+        }
+        length = bufLen;
+    }
+    else if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        const uint16_t NOVENA_GPIO_ADDR = 0x0706;
+        if(pkt.cmd == CMD_LMS7002_RST)
+        {
+            buffer = new unsigned char[8];
+            buffer[0] = (NOVENA_GPIO_ADDR >> 8) | 0x80;
+            buffer[1] = NOVENA_GPIO_ADDR & 0xFF;
+            buffer[2] = 0x00;
+            buffer[3] = 0x18;
+            buffer[4] = (NOVENA_GPIO_ADDR >> 8) | 0x80;
+            buffer[5] = NOVENA_GPIO_ADDR & 0xFF;
+            buffer[6] = 0x00;
+            buffer[7] = 0x38;
+            length = 8;
+        }
+        else
+        {
+            buffer = new unsigned char[pkt.outBuffer.size()];
+            memcpy(buffer, &pkt.outBuffer[0], pkt.outBuffer.size());
+            if (pkt.cmd == CMD_LMS7002_WR)
+            {
+                for(int i=0; i<pkt.outBuffer.size(); i+=4)
+                    buffer[i] |= 0x80;
+            }
+            length = pkt.outBuffer.size();
+        }
+    }
+    return buffer;
+}
+
+/** @brief Parses given data buffer into generic packet
+    @param pkt destination packet
+    @param buffer received data from board
+    @param length received buffer length
+    @param protocol which protocol to use for data parsing
+    @return 1:success, 0:failure
+*/
+int LMScomms::ParsePacket(GenericPacket& pkt, const unsigned char* buffer, const int length, const eLMS_PROTOCOL protocol)
+{
+    if(protocol == LMS_PROTOCOL_UNDEFINED)
+        return -1;
+
+    if(protocol == LMS_PROTOCOL_LMS64C)
+    {
+        ProtocolLMS64C packet;
+        int inBufPos = 0;
+        pkt.inBuffer.resize(packet.maxDataLength*(length / packet.pktLength + (length % packet.pktLength)), 0);
+        for(int i=0; i<length; i+=packet.pktLength)
+        {
+            pkt.cmd = (eCMD_LMS)buffer[i];
+            pkt.status = (eCMD_STATUS)buffer[i+1];
+            memcpy(&pkt.inBuffer[inBufPos], &buffer[i+8], packet.maxDataLength);
+            inBufPos += packet.maxDataLength;
+        }
+    }
+    else if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        pkt.cmd = CMD_LMS7002_RD;
+        pkt.status = STATUS_COMPLETED_CMD;
+        pkt.inBuffer.clear();
+        for(int i=0; i<length; i+=2)
+        {
+            //reading from spi returns only registers values
+            //fill addresses as zeros to match generic format of address, value pairs
+            pkt.inBuffer.push_back(0); //should be address msb
+            pkt.inBuffer.push_back(0); //should be address lsb
+            pkt.inBuffer.push_back(buffer[i]);
+            pkt.inBuffer.push_back(buffer[i+1]);
+        }
+    }
+    return 1;
+}
+
+/** @brief Sets callback function which gets called each time data is sent or received
+*/
+void LMScomms::SetDataLogCallback(std::function<void(bool, const unsigned char*, const unsigned int)> callback)
+{
+    callback_logData = callback;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.h
new file mode 100644
index 0000000000000000000000000000000000000000..3d94d8ece236d3e96dfb1484dd31263c4d440492
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/lmsComms.h
@@ -0,0 +1,111 @@
+/**
+@file   LMScomms.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for handling data transmission to LMS boards
+*/
+
+#ifndef LMS_COMMS_H
+#define LMS_COMMS_H
+
+#include "lms7002_defines.h"
+#include "connectionManager/ConnectionManager.h"
+#include <string.h>
+#include <mutex>
+
+struct LMSinfo
+{
+    eLMS_DEV device;
+    eEXP_BOARD expansion;
+    int firmware;
+    int hardware;
+    int protocol;
+};
+
+/*  @brief Class for abstracting transfering data to and from chip
+*/
+class LMScomms : public ConnectionManager
+{	
+public:
+	enum TransferStatus
+	{
+		TRANSFER_SUCCESS,
+		TRANSFER_FAILED,
+		NOT_CONNECTED
+	};
+
+    enum eLMS_PROTOCOL
+    {
+        LMS_PROTOCOL_UNDEFINED = 0,
+        LMS_PROTOCOL_DIGIC,
+        LMS_PROTOCOL_LMS64C,
+        LMS_PROTOCOL_NOVENA,
+    };
+    struct ProtocolDIGIC
+    {
+        static const int pktLength = 64;
+        static const int maxDataLength = 60;
+        ProtocolDIGIC() : cmd(0), i2cAddr(0), blockCount(0) {};
+        unsigned char cmd;
+        unsigned char i2cAddr;
+        unsigned char blockCount;
+        unsigned char reserved;
+        unsigned char data[maxDataLength];
+    };
+
+    struct ProtocolLMS64C
+    {
+        static const int pktLength = 64;
+        static const int maxDataLength = 56;
+        ProtocolLMS64C() :cmd(0),status(STATUS_UNDEFINED),blockCount(0)
+        {
+            memset(reserved, 0, 5);
+        };
+        unsigned char cmd;
+        unsigned char status;
+        unsigned char blockCount;
+        unsigned char reserved[5];
+        unsigned char data[maxDataLength];
+    };
+
+    struct ProtocolNovena
+    {
+        static const int pktLength = 128;
+        static const int maxDataLength = 128;
+        ProtocolNovena() :cmd(0),status(0) {};
+        unsigned char cmd;
+        unsigned char status;
+        unsigned char blockCount;
+        unsigned char data[maxDataLength];
+    };
+
+    struct GenericPacket
+    {   
+        GenericPacket()
+        {
+            cmd = CMD_GET_INFO;
+            status = STATUS_UNDEFINED;
+        }
+
+        eCMD_LMS cmd;
+        eCMD_STATUS status;
+        vector<unsigned char> outBuffer;
+        vector<unsigned char> inBuffer;
+    };
+
+    LMScomms();
+    ~LMScomms();
+
+    virtual TransferStatus TransferPacket(GenericPacket &pkt);
+    LMSinfo GetInfo();
+    void SetDataLogCallback(std::function<void(bool, const unsigned char*, const unsigned int)> callback);
+protected:
+    std::function<void(bool, const unsigned char*, const unsigned int)> callback_logData;
+    std::mutex mControlPortLock;
+    unsigned char* PreparePacket(const GenericPacket &pkt, int &length, const eLMS_PROTOCOL protocol);
+    int ParsePacket(GenericPacket &pkt, const unsigned char* buffer, const int length, const eLMS_PROTOCOL protocol);
+protected:
+    bool mSystemBigEndian;
+};
+
+#endif // LMS_COMMS_H
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/typedefs.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/typedefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..9ae0c25d93843298f9a95236aa2e10c3272ac3db
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms7002m/typedefs.h
@@ -0,0 +1,18 @@
+/**
+@file	typedefs.h
+@author Lime Microsystems (www.limemicro.com)
+@brief 	Variables types definitions
+*/
+
+#ifndef LMS7002M_TYPEDEFS_H
+#define LMS7002M_TYPEDEFS_H
+
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned short uint16_t;
+typedef short int16_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef double float_type;
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/CMakeLists.txt b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0225e1d4d6148af3df4055101eadb954c86768d8
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/CMakeLists.txt
@@ -0,0 +1,58 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE TYPE INTERNAL FORCE)
+project("matlab_StreamDLL")
+#include modules for finding CyAPI
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+cmake_policy(SET CMP0015 OLD)
+if(${CMAKE_MAJOR_VERSION} GREATER 2)
+	cmake_policy(SET CMP0043 NEW)
+endif()
+ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+if(CMAKE_COMPILER_IS_GNUCXX)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fPIC")
+endif()
+
+# Add sub-directories
+add_subdirectory(LMS_StreamBoard)
+include_directories(LMS_StreamBoard)
+add_subdirectory(connectionManager)
+include_directories(connectionManager)
+
+set(BINARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin")
+	
+if (MSVC)
+	SET( MSVC_MULTITHREAD_COMPILE_FLAGS "/MP")
+	SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${MSVC_MULTITHREAD_COMPILE_FLAGS}" )
+endif(MSVC)
+
+set(Library_file_list LMS_SDR.cpp )
+
+set(BUILD_STATIC_LIB OFF CACHE BOOL "Build static or dynamic library")
+if( BUILD_STATIC_LIB )
+	add_library(LMS_SDR STATIC ${Library_file_list})
+else()
+	add_library(LMS_SDR SHARED ${Library_file_list})
+endif(BUILD_STATIC_LIB)
+
+set(AUTO_UPDATE_VERSION OFF CACHE BOOL "Uses python script to increment version")
+if(AUTO_UPDATE_VERSION)
+	add_custom_target(updateVersion ALL COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/auto_version.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})	
+	add_dependencies(LMS_SDR updateVersion)
+endif()
+
+target_link_libraries(LMS_SDR
+	LMS_StreamBoard 
+	${CYAPI_LIBRARIES}
+	)
+	
+if(WIN32)
+	find_package(CyAPI REQUIRED)
+	LINK_DIRECTORIES(${CYAPI_LIBRARIES})	
+	include_directories(${CYAPI_INCLUDE_DIRS})
+	set(CONNECTION_MANAGER_LIBS ${CYAPI_LIBRARIES} SetupAPI)	
+endif()
+if(UNIX)	
+	set(CONNECTION_MANAGER_LIBS usb-1.0 -lpthread)	
+endif()
+
+target_link_libraries(LMS_SDR ${CONNECTION_MANAGER_LIBS})
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1ff4bbf1de7b1a3f9587f8183a74b14e53c8f2b9
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.cpp
@@ -0,0 +1,334 @@
+/**
+@author Lime Microsystems
+@brief  Stream board communications for Matlab
+*/
+
+#include "LMS_SDR.h"
+
+#include "lmsComms.h"
+#include "LMS_StreamBoard.h"
+#include "ringBuffer.h"
+#include "IConnection.h"
+#include "fifo.h"
+#include "dataTypes.h"
+#include <unistd.h>
+#include <thread>
+
+#include <vector>
+#include <atomic>
+#include <thread>
+#include <mutex>
+#include <chrono>
+
+#define _USE_MATH_DEFINES
+#include <math.h>
+
+using namespace std;
+
+typedef enum
+{
+    LMS_SUCCESS = 0,
+    LMS_ERROR
+} LMS_STATUS;
+
+LMS_SamplesFIFO rxBuffer(1);
+static thread rxThread;
+atomic<bool> rxStop(1);
+atomic<bool> rxRunning(0);
+atomic<unsigned long> rxDroppedSamples(0);
+atomic<long> RxDataRate(0);
+atomic<uint32_t> rxSamplingRate(0);
+
+LMS_SamplesFIFO txBuffer(1);
+static thread txThread;
+atomic<bool> txStop(1);
+atomic<bool> txRunning(0);
+atomic<long> txDroppedSamples(0);
+atomic<long> TxDataRate(0);
+atomic<uint32_t> txSamplingRate(0);
+
+LMScomms comPort(IConnection::COM_PORT);
+LMScomms usbPort(IConnection::USB_PORT);
+LMS_StreamBoard streamer(&usbPort);
+
+const int samplesInPacket = 1024;
+unsigned int opMode = 0;
+
+DLL_EXPORT void LMS_Stats(uint32_t *RxBufSize, uint32_t *RxBufFilled, uint32_t *RxSamplingRate, uint32_t *TxBufSize, uint32_t *TxBufFilled, uint32_t *TxSamplingRate)
+{   
+    LMS_SamplesFIFO::BufferInfo rxStats = rxBuffer.GetInfo();
+    LMS_SamplesFIFO::BufferInfo txStats = txBuffer.GetInfo();
+    if (RxBufSize)
+        *RxBufSize = rxStats.size*samplesInPacket;
+    if (RxBufFilled)
+        *RxBufFilled = rxStats.itemsFilled*samplesInPacket;
+    if (TxBufSize)
+        *TxBufSize = txStats.size*samplesInPacket;
+    if (TxBufFilled)
+        *TxBufFilled = txStats.itemsFilled*samplesInPacket;
+    if (TxSamplingRate)
+        *TxSamplingRate = txSamplingRate.load();
+    if (RxSamplingRate)
+        *RxSamplingRate = rxSamplingRate.load();
+}
+
+DLL_EXPORT int LMS_Init(const int OperationMode, uint32_t trxBuffersLength)
+{   
+    opMode = OperationMode;
+    unsigned int packetsNeeded = trxBuffersLength / samplesInPacket;
+    if (trxBuffersLength % samplesInPacket != 0)
+        ++packetsNeeded;
+    if (packetsNeeded >= (uint32_t)(1 << 31))
+        packetsNeeded = (uint32_t)(1 << 31);
+    for (int i = 0; i < 32; ++i)
+        if ((1 << i) >= packetsNeeded)
+        {
+            packetsNeeded = (1 << i);
+            break;
+        }
+    rxBuffer.Reset(packetsNeeded);
+    txBuffer.Reset(packetsNeeded);
+    return LMS_SUCCESS;
+}
+
+DLL_EXPORT int LMS_Destroy()
+{
+    LMS_RxStop();
+    //buffers size is reduced to lower memory consumption when not used
+    rxBuffer.Reset(1);
+    txBuffer.Reset(1);
+    return LMS_SUCCESS;
+}
+
+DLL_EXPORT LMScomms* LMS_GetUSBPort()
+{
+	return &usbPort;
+}
+
+DLL_EXPORT LMScomms* LMS_GetCOMPort()
+{
+	return &comPort;
+}
+
+const int maxDevListLen = 32;
+const int maxDevNameLen = 256; //each device name not longer than 256
+static char DeviceNames[maxDevListLen][maxDevNameLen];
+
+DLL_EXPORT int LMS_UpdateDeviceList(LMScomms* port)
+{   
+    memset(DeviceNames, 0, maxDevListLen*maxDevNameLen);
+    port->Close();
+    int devCount = port->RefreshDeviceList();
+    vector<string> names = port->GetDeviceList();
+    int charsWritten = 0;
+    for (unsigned int i = 0; i < names.size() && i < maxDevListLen; ++i)
+    {   
+        charsWritten += sprintf(DeviceNames[i], "[%i] %.*s", i, maxDevNameLen, names[i].c_str());
+    }
+    return devCount;
+}
+
+DLL_EXPORT const char* LMS_GetDeviceName(LMScomms* port, unsigned int deviceIndex)
+{   
+    if (deviceIndex < maxDevListLen)
+        return DeviceNames[deviceIndex];
+    else
+        return "";
+}
+
+DLL_EXPORT int LMS_DeviceOpen(LMScomms* port, const uint32_t deviceIndex)
+{
+    port->Close();
+    int status = port->Open(deviceIndex);
+    if (status == 1)
+    {
+        return LMS_SUCCESS;
+    }
+    else
+    {
+        return LMS_ERROR;
+    }    
+}
+
+DLL_EXPORT void LMS_DeviceClose(LMScomms* port)
+{
+    port->Close();
+}
+
+DLL_EXPORT uint32_t LMS_ControlWrite(LMScomms* port, const uint8_t *buffer, const uint16_t bufLen)
+{
+    return port->Write(buffer, bufLen, 0);
+}
+
+DLL_EXPORT uint32_t LMS_ControlRead(LMScomms* port, uint8_t* buffer, const uint16_t bufLen)
+{
+    return port->Read(buffer, bufLen, 0);
+}
+
+
+
+const int RX_BUFF_SZ (1020*1024/4);
+uint32_t rx_buffer[RX_BUFF_SZ];
+uint64_t start_timestamp = 0;;
+uint32_t wr_pos = 0;
+uint32_t rd_pos = 0;
+
+void ReceivePackets()
+{
+    rxRunning.store(true);
+    uint32_t samplesCollected = 0;
+
+    const int bufferSize = 4096;// 4096;
+    const int buffersCount = 32; // must be power of 2
+    const int buffersCountMask = buffersCount - 1;
+    int handles[buffersCount]= {0}; 
+    char buffers[buffersCount*bufferSize]={0};
+    
+    struct sched_param sp;
+    sp.sched_priority = sched_get_priority_max(SCHED_FIFO);
+    if (pthread_setschedparam(pthread_self(),SCHED_FIFO,&sp)!=0)
+    {
+     printf("Shed prams failed\n");  
+    }
+
+    //switch off Rx
+    uint16_t regVal = streamer.SPI_read(0x0005);
+    streamer.SPI_write(0x0005, regVal & ~0x6);
+    //USB FIFO reset
+    LMScomms::GenericPacket ctrPkt;
+    ctrPkt.cmd = CMD_USB_FIFO_RST;
+    ctrPkt.outBuffer.push_back(0x01);
+    usbPort.TransferPacket(ctrPkt);
+    ctrPkt.outBuffer[0] = 0x00;
+    usbPort.TransferPacket(ctrPkt);
+
+    streamer.SPI_write(0x0005, regVal | 0x6);  
+    
+    streamer.SPI_write(0x0001, 0x0001);
+    streamer.SPI_write(0x0007, 0x0000);
+    
+    for (int i = 0; i<buffersCount; ++i)
+        handles[i] = usbPort.BeginDataReading(&buffers[i*bufferSize], bufferSize);
+
+    int bi = 0;
+
+    while (rxStop.load() != true)
+    {
+        if (usbPort.WaitForReading(handles[bi], 1000) == false)
+            break;
+
+        long bytesToRead = bufferSize;
+        long bytesReceived = usbPort.FinishDataReading(&buffers[bi*bufferSize], bytesToRead, handles[bi]);
+        if (bytesReceived > 0)
+        {	
+            PacketLTE* pkt = (PacketLTE*)&buffers[bi*bufferSize];
+            for(uint16_t sampleIndex = 0; sampleIndex < sizeof(pkt->samples)/sizeof(int16_t); sampleIndex++)
+            {
+                    pkt->samples[sampleIndex] <<= 4;
+                    pkt->samples[sampleIndex] >>= 4;		
+            }
+
+            rxBuffer.push_samples((complex16_t*)pkt->samples, 1020, pkt->counter, 100);                  
+        }
+        // Re-submit this request to keep the queue full
+        memset(&buffers[bi*bufferSize], 0, bufferSize);
+        handles[bi] = usbPort.BeginDataReading(&buffers[bi*bufferSize], bufferSize);
+        bi = (bi + 1) & buffersCountMask;
+        pthread_yield();
+    }
+    
+    usbPort.AbortReading();
+    for (int j = 0; j<buffersCount; j++)
+    {
+        long bytesToRead = bufferSize;
+        usbPort.WaitForReading(handles[j], 1000);
+        usbPort.FinishDataReading(&buffers[j*bufferSize], bytesToRead, handles[j]);
+    }
+    rxRunning.store(false);
+}
+
+
+DLL_EXPORT uint32_t LMS_TRxWrite(const int16_t *data, const uint32_t samplesCount, const uint32_t antenna_id, uint64_t timestamp)
+{
+    static uint32_t tx_buffer[1020];
+    static int index = 0;
+  
+    const int bufferSize = 1024 * 4;
+    const int buffersCount = 32; // must be power of 2
+    const int buffersCountMask = buffersCount - 1;
+
+    static int handles[buffersCount] = {0};
+    static char buffers[buffersCount*bufferSize]={0};
+    static bool bufferUsed[buffersCount] = {0};    
+    static int bi = 0; //buffer index
+    PacketLTE* pkt;
+
+    uint64_t ts = timestamp - index;
+
+    pkt = (PacketLTE*)&buffers[bi*bufferSize];
+
+    for (int i=0;i<samplesCount;i++)
+    {
+      ((uint32_t*)pkt->samples)[index++]=(((uint32_t*)data)[i]& 0xFFF0FFF) | 0x1000;
+
+      if (index == 1020)
+      {    
+       pkt->counter = ts;
+
+       if (bufferUsed[bi])
+       {
+              if (usbPort.WaitForSending(handles[bi], 1000) == false)
+                  return -1;
+              // Must always call FinishDataXfer to release memory of contexts[i]
+              long tempToSend = sizeof(PacketLTE);
+              usbPort.FinishDataSending(&buffers[bi*bufferSize], tempToSend, handles[bi]);
+
+              bufferUsed[bi] = false;
+         }
+        handles[bi] = usbPort.BeginDataSending(&buffers[bi*bufferSize], sizeof(PacketLTE));
+        bufferUsed[bi] = true;
+        bi = (bi + 1) & buffersCountMask;  
+        pkt = (PacketLTE*)&buffers[bi*bufferSize];
+        ts += 1020;
+        index = 0;       
+      }
+    } 
+}
+
+vector<PacketLTE> PacketsBuffer(2048, PacketLTE());
+DLL_EXPORT uint32_t LMS_TRxRead(int16_t *buffer, const uint32_t samplesCount, const uint32_t antenna_id, uint64_t *timestamp, const uint32_t timeout_ms)
+{
+	if (usbPort.IsOpen() == false && opMode != -1)
+        return 0;
+    pthread_yield();
+    uint32_t samplesPopped = rxBuffer.pop_samples((complex16_t*)buffer, samplesCount, timestamp, timeout_ms);
+    return samplesPopped;
+}
+
+
+DLL_EXPORT int LMS_RxStart()
+{
+    if (rxRunning.load())
+        return 1;
+    if (usbPort.IsOpen() == false && opMode != -1)
+        return 1;
+    rxStop.store(false);
+    unsigned int bufSz = rxBuffer.GetInfo().size;
+    rxBuffer.Reset(bufSz);
+    rxThread = thread(ReceivePackets);
+    return 0;
+}
+
+DLL_EXPORT int LMS_RxStop()
+{
+    if (rxRunning.load())
+    {        
+        if (rxThread.joinable())
+        {
+            rxStop.store(true);
+            rxThread.join();
+        }
+        rxStop.store(true);
+    }
+    return 0;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.h
new file mode 100644
index 0000000000000000000000000000000000000000..27a72e351a63ba5b71e2b92add5614a40ef654b9
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_SDR.h
@@ -0,0 +1,143 @@
+/**
+@author Lime Microsystems
+@brief  Interface for implementing SDR using Lime microsystems boards
+*/
+
+#ifndef LMS_SDR_INTERFACE_H
+#define LMS_SDR_INTERFACE_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+class LMScomms;
+#else
+typedef void LMScomms;
+#endif
+
+#define BUILD_DLL
+#ifndef __unix__
+#ifdef BUILD_DLL
+    #define DLL_EXPORT __declspec(dllexport)
+#else
+    #define DLL_EXPORT __declspec(dllimport)
+#endif
+#else
+#define DLL_EXPORT
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @brief Returns stats of internal buffers
+    @param RxBufSize Receiver buffer size in samples
+    @param RxBufFilled Number of samples currently in the receiver buffer
+    @param RxSamplingRate Approximate receiver sampling rate, calculated from incomming data
+    @param TxBufSize Transmitter buffer size in samples
+    @param TxBufFilled Number of samples currently in the transmitter buffer
+    @param TxSamplingRate Approximate transmitter sampling rate, calculated from incomming data
+*/
+DLL_EXPORT void LMS_Stats(uint32_t *RxBufSize, uint32_t *RxBufFilled, uint32_t *RxSamplingRate, uint32_t *TxBufSize, uint32_t *TxBufFilled, uint32_t *TxSamplingRate);
+
+/**	@brief Initializes internal memory for samples buffering to hardware
+    @param OperationMode samples transfering mode: 0-packets synchronized, 1-packets not synchronized
+    @param trxBuffersLength Rx and Tx internal buffers size in samples
+	@return 0 success, -1 failure
+
+    Generally trxBuffersSamplesCount should be more than 65536
+*/
+DLL_EXPORT int LMS_Init(const int OperationMode, uint32_t trxBuffersLength);
+
+/**	@brief Stops internal threads and frees internal buffers memory
+	@return 0 success, -1 failure
+*/
+DLL_EXPORT int LMS_Destroy();
+
+///@name Device connection
+/**	@return object for communicating over USB port
+*/
+DLL_EXPORT LMScomms* LMS_GetUSBPort();
+
+/**	@return object for communicating over COM port
+*/
+DLL_EXPORT LMScomms* LMS_GetCOMPort();
+
+/** @brief Refreshes currently connected device list
+    @param port Communications port to update
+    @return number of devices connected
+*/
+DLL_EXPORT int LMS_UpdateDeviceList(LMScomms* port);
+
+/** @brief Returns pointer to static null terminated c-string name of selected device
+    @param port Communications port object
+    @param deviceIndex index from communications port device list
+*/
+DLL_EXPORT const char* LMS_GetDeviceName(LMScomms* port, unsigned int deviceIndex);
+
+/**	@brief Connects to selected device on given port
+    @param port Communications port object
+    @param deviceIndex index from communications port device list
+	@return 0-success
+*/
+DLL_EXPORT int LMS_DeviceOpen(LMScomms* port, const uint32_t deviceIndex);
+
+/**	@brief Closes connection on given port
+    @param port Communications port to close
+*/
+DLL_EXPORT void LMS_DeviceClose(LMScomms* port);
+///@}
+
+///@name Communications
+/**	@brief Writes given data to control port
+	@param port Port for communications
+    @param buffer data to be written
+    @param bufLen buffer length in bytes
+    @return number of bytes written
+*/
+DLL_EXPORT uint32_t LMS_ControlWrite(LMScomms* port, const uint8_t *buffer, const uint16_t bufLen);
+
+/**	@brief Reads given data from SPI regiter
+    @param port Port for communications
+    @param buffer destination buffer for data
+    @param bufLen number of bytes to read
+	@return number of bytes read
+*/
+DLL_EXPORT uint32_t LMS_ControlRead(LMScomms* port, uint8_t* buffer, const uint16_t bufLen);
+
+/** @brief Starts thread for samples receiving
+    @return 0-success
+*/
+DLL_EXPORT int LMS_RxStart();
+
+/** @brief Stops samples receiving thread
+    @return 0:success, 1:failed
+*/
+DLL_EXPORT int LMS_RxStop();
+
+/** @brief Adds given samples to transmitter buffer, to be sent at specified timestamp
+@param buffer source array for interleaved values (IQIQIQ...), each value amplitude should be from -2048 to 2047
+@param samplesCount number of samples in buffer, 1 sample = 2 bytes I + 2 bytes Q
+@param channel_id destination channel
+@param timestamp timestamp when the first sample in buffer should be transmitted (used only in synchronized operating mode)
+@param timeout_ms time amount in milliseconds to try adding samples
+@return number of samples written
+*/
+DLL_EXPORT uint32_t LMS_TRxWrite(const int16_t *buffer, const uint32_t samplesCount, const uint32_t channel_id, uint64_t timestamp);
+
+/** @brief Reads samples from receiver buffer
+@param buffer destination array for interleaved values (IQIQIQ...), must be big enough to store requested number of samples, each value amplitude will be from -2048 to 2047
+@param samplesCount number of samples to read, 1 sample = 2 bytes I + 2 bytes Q
+@param antenna_id source channel
+@param timestamp returns timestamp of the first sample in the buffer (used only in synchronized operating mode)
+@param timeout_ms time amount in milliseconds to try reading samples
+@return number of samples read
+*/
+DLL_EXPORT uint32_t LMS_TRxRead(int16_t *buffer, const uint32_t samplesCount, const uint32_t channel_id, uint64_t *timestamp, const uint32_t timeout_ms);
+
+///@}
+
+#ifdef __cplusplus
+} //extern "C"
+#endif
+
+#endif //LMS_SDR_INTERFACE_H
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/CMakeLists.txt b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..02e6bb5ab92be2e0ea821285697f5dd771fc189a
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(streamBoard_src_files
+	LMS_StreamBoard.cpp
+)
+
+add_library(LMS_StreamBoard STATIC ${streamBoard_src_files})
+target_include_directories(LMS_StreamBoard PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(LMS_StreamBoard ConnectionManager)	
+
+if(WIN32 AND ENABLE_USB_CONNECTION)
+	find_package(CyAPI REQUIRED)
+	LINK_DIRECTORIES(${CYAPI_LIBRARIES})	
+	include_directories(${CYAPI_INCLUDE_DIRS})
+	set(CONNECTION_MANAGER_LIBS ${CYAPI_LIBRARIES} SetupAPI)
+	target_link_libraries(LMS_StreamBoard ${CONNECTION_MANAGER_LIBS})	
+endif()
+if(UNIX AND ENABLE_USB_CONNECTION)	
+	set(CONNECTION_MANAGER_LIBS usb-1.0 -lpthread)
+	target_link_libraries(LMS_StreamBoard ${CONNECTION_MANAGER_LIBS})
+endif()
+
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..da9e4a7b8e6e97ab27c22f4757bd7ddba3141cf9
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.cpp
@@ -0,0 +1,770 @@
+#include "LMS_StreamBoard.h"
+#include "lmsComms.h"
+#include "lms7002_defines.h"
+#include <assert.h>
+#include <iostream>
+
+/** @brief Configures Stream board FPGA clocks
+    @param serPort Communications port to send data
+    @param fOutTx_MHz transmitter frequency in MHz
+    @param fOutRx_MHz receiver frequency in MHz
+    @param phaseShift_deg IQ phase shift in degrees
+    @return 0-success, other-failure
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::ConfigurePLL(LMScomms *serPort, const float fOutTx_MHz, const float fOutRx_MHz, const float phaseShift_deg)
+{
+    assert(serPort != nullptr);
+    if (serPort == NULL)
+        return FAILURE;
+    if (serPort->IsOpen() == false)
+        return FAILURE;
+    const float vcoLimits_MHz[2] = { 600, 1300 };
+    int M, C;
+    const short bufSize = 64;
+
+    float fOut_MHz = fOutTx_MHz;
+    float coef = 0.8*vcoLimits_MHz[1] / fOut_MHz;
+    M = C = (int)coef;
+    int chigh = (((int)coef) / 2) + ((int)(coef) % 2);
+    int clow = ((int)coef) / 2;
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_BRDSPI_WR;
+    
+    if (fOut_MHz*M > vcoLimits_MHz[0] && fOut_MHz*M < vcoLimits_MHz[1])
+    {   
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x0F);
+        pkt.outBuffer.push_back(0x15); //c4-c2_bypassed
+        pkt.outBuffer.push_back(0x01 | ((M % 2 != 0) ? 0x08 : 0x00) | ((C % 2 != 0) ? 0x20 : 0x00)); //N_bypassed
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x08);
+        pkt.outBuffer.push_back(1); //N_high_cnt
+        pkt.outBuffer.push_back(1);//N_low_cnt
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x09);
+        pkt.outBuffer.push_back(chigh); //M_high_cnt
+        pkt.outBuffer.push_back(clow);	 //M_low_cnt
+        for (int i = 0; i <= 1; ++i)
+        {
+            pkt.outBuffer.push_back(0x00);
+            pkt.outBuffer.push_back(0x0A + i);
+            pkt.outBuffer.push_back(chigh); //cX_high_cnt
+            pkt.outBuffer.push_back(clow);	 //cX_low_cnt
+        }
+
+        float Fstep_us = 1 / (8 * fOutTx_MHz*C);
+        float Fstep_deg = (360 * Fstep_us) / (1 / fOutTx_MHz);
+        short nSteps = phaseShift_deg / Fstep_deg;
+        unsigned short reg2 = 0x0400 | (nSteps & 0x3FF);
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x02);
+        pkt.outBuffer.push_back((reg2 >> 8));
+        pkt.outBuffer.push_back(reg2); //phase
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x03);
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x01);
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x03);
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x00);
+
+        reg2 = reg2 | 0x800;
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x02);
+        pkt.outBuffer.push_back((reg2 >> 8));
+        pkt.outBuffer.push_back(reg2);
+
+        if(serPort->TransferPacket(pkt) != LMScomms::TRANSFER_SUCCESS || pkt.status != STATUS_COMPLETED_CMD)
+            return FAILURE;
+    }
+    else
+        return FAILURE;
+
+    fOut_MHz = fOutRx_MHz;
+    coef = 0.8*vcoLimits_MHz[1] / fOut_MHz;
+    M = C = (int)coef;
+    chigh = (((int)coef) / 2) + ((int)(coef) % 2);
+    clow = ((int)coef) / 2;
+    if (fOut_MHz*M > vcoLimits_MHz[0] && fOut_MHz*M < vcoLimits_MHz[1])
+    {
+        short index = 0;
+        pkt.outBuffer.clear();
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x0F);
+        pkt.outBuffer.push_back(0x15); //c4-c2_bypassed
+        pkt.outBuffer.push_back(0x41 | ((M % 2 != 0) ? 0x08 : 0x00) | ((C % 2 != 0) ? 0x20 : 0x00)); //N_bypassed, c1 bypassed
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x08);
+        pkt.outBuffer.push_back(1); //N_high_cnt
+        pkt.outBuffer.push_back(1);//N_low_cnt
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x09);
+        pkt.outBuffer.push_back(chigh); //M_high_cnt
+        pkt.outBuffer.push_back(clow);	 //M_low_cnt
+        for (int i = 0; i <= 1; ++i)
+        {
+            pkt.outBuffer.push_back(0x00);
+            pkt.outBuffer.push_back(0x0A + i);
+            pkt.outBuffer.push_back(chigh); //cX_high_cnt
+            pkt.outBuffer.push_back(clow);	 //cX_low_cnt
+        }
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x03);
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x02);
+
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x03);
+        pkt.outBuffer.push_back(0x00);
+        pkt.outBuffer.push_back(0x00);
+
+        if (serPort->TransferPacket(pkt) != LMScomms::TRANSFER_SUCCESS || pkt.status != STATUS_COMPLETED_CMD)
+            return FAILURE;
+    }
+    else
+        return FAILURE;
+    return SUCCESS;
+}
+
+/** @brief Captures IQ samples from Stream board, this is blocking function, it blocks until desired frames count is captured
+    @param isamples destination array for I samples, must be big enough to contain samplesCount
+    @param qsamples destination array for Q samples, must be big enough to contain samplesCount
+    @param framesCount number of IQ frames to capture
+    @param frameStart frame start indicator 0 or 1
+    @return 0-success, other-failure
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::CaptureIQSamples(LMScomms *dataPort, int16_t *isamples, int16_t *qsamples, const uint32_t framesCount, const bool frameStart)
+{
+    assert(dataPort != nullptr);
+    if (dataPort == NULL)
+        return FAILURE;
+    if (dataPort->IsOpen() == false)
+        return FAILURE;
+
+    int16_t sample_value;
+    const uint32_t bufSize = framesCount * 2 * sizeof(uint16_t);
+    char *buffer = new char[bufSize];
+    if (buffer == 0)
+    {
+#ifndef NDEBUG
+        std::cout << "Failed to allocate memory for samples buffer" << std::endl;
+#endif
+        return FAILURE;
+    }
+    memset(buffer, 0, bufSize);
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_BRDSPI_RD;
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+    dataPort->TransferPacket(pkt);
+    if (pkt.status != STATUS_COMPLETED_CMD)
+        return FAILURE;
+
+    uint16_t regVal = (pkt.inBuffer[2] * 256) + pkt.inBuffer[3];
+    pkt.cmd = CMD_BRDSPI_WR;
+    pkt.outBuffer.clear();
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+    pkt.outBuffer.push_back(0);
+    pkt.outBuffer.push_back(regVal | 0x4);    
+    dataPort->TransferPacket(pkt);
+    if (pkt.status != STATUS_COMPLETED_CMD)
+        return FAILURE;
+
+    int bytesReceived = 0;
+    for(int i = 0; i<3; ++i)
+        bytesReceived = dataPort->ReadStream(buffer, bufSize, 5000);
+    if (bytesReceived > 0)
+    {
+        bool iqSelect = false;
+        int16_t frameCounter = 0;        
+        for (uint32_t b = 0; b < bufSize;)
+        {
+            sample_value = buffer[b++] & 0xFF;
+            sample_value |= (buffer[b++] & 0x0F) << 8;
+            sample_value = sample_value << 4; //shift left then right to fill sign bits
+            sample_value = sample_value >> 4;
+            if (iqSelect == false)
+                isamples[frameCounter] = sample_value;
+            else
+                qsamples[frameCounter] = sample_value;
+            frameCounter += iqSelect;
+            iqSelect = !iqSelect;
+        }        
+    }
+    pkt.cmd = CMD_BRDSPI_RD;
+    pkt.outBuffer.clear();
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x01);
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);    
+    dataPort->TransferPacket(pkt);
+
+    regVal = (pkt.inBuffer[2] * 256) + pkt.inBuffer[3];
+    pkt.cmd = CMD_BRDSPI_WR;
+    pkt.outBuffer.clear();
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+    pkt.outBuffer.push_back(0);
+    pkt.outBuffer.push_back(regVal & ~0x4);    
+    dataPort->TransferPacket(pkt);
+
+    delete[] buffer;
+    return SUCCESS;
+}
+
+/** @brief Blocking operation to upload IQ samples to Stream board RAM
+    @param serPort port to use for communication
+    @param isamples I channel samples
+    @param qsamples Q channel samples
+    @param framesCount number of samples in arrays
+    @return 0-success, other-failure
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::UploadIQSamples(LMScomms* serPort, int16_t *isamples, int16_t *qsamples, const uint32_t framesCount)
+{
+    int bufferSize = framesCount * 2;
+    uint16_t *buffer = new uint16_t[bufferSize];
+    memset(buffer, 0, bufferSize*sizeof(uint16_t));
+    int bufPos = 0;
+    for (unsigned i = 0; i<framesCount; ++i)
+    {   
+        buffer[bufPos] = (isamples[i] & 0xFFF);
+        buffer[bufPos + 1] = (qsamples[i] & 0xFFF) | 0x1000;
+        bufPos += 2;
+    }
+    const long outLen = bufPos * 2;
+    int packetSize = 65536;
+    int sent = 0;
+    bool success = true;
+
+    LMScomms::GenericPacket pkt;
+    pkt.cmd = CMD_BRDSPI_RD;
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+
+    serPort->TransferPacket(pkt);
+    pkt.cmd = CMD_BRDSPI_WR;
+    pkt.outBuffer.clear();
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+    pkt.outBuffer.push_back(pkt.inBuffer[2]);
+    pkt.outBuffer.push_back(pkt.inBuffer[3] & ~0x7);
+    serPort->TransferPacket(pkt);
+
+    while (sent<outLen)
+    {
+        char *outBuf = (char*)buffer;
+        const long toSendBytes = outLen - sent > packetSize ? packetSize : outLen - sent;
+        long toSend = toSendBytes;
+        int context = serPort->BeginDataSending(&outBuf[sent], toSend);
+        if (serPort->WaitForSending(context, 5000) == false)
+        {
+            success = false;
+            serPort->FinishDataSending(&outBuf[sent], toSend, context);
+            break;
+        }
+        sent += serPort->FinishDataSending(&outBuf[sent], toSend, context);
+    }
+    
+    pkt.cmd = CMD_BRDSPI_RD;
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+
+    serPort->TransferPacket(pkt);
+    pkt.cmd = CMD_BRDSPI_WR;
+    pkt.outBuffer.clear();
+    pkt.outBuffer.push_back(0x00);
+    pkt.outBuffer.push_back(0x05);
+    pkt.outBuffer.push_back(pkt.inBuffer[2]);
+    pkt.outBuffer.push_back(pkt.inBuffer[3] | 0x3);
+    serPort->TransferPacket(pkt);
+    return success ? SUCCESS : FAILURE;
+}
+
+LMS_StreamBoard::LMS_StreamBoard(LMScomms* dataPort)
+{
+    mRxFrameStart.store(true);
+    mDataPort = dataPort;
+    mRxFIFO = new LMS_StreamBoard_FIFO<SamplesPacket>(1024*4);
+    mTxFIFO = new LMS_StreamBoard_FIFO<SamplesPacket>(1024*4);
+    mStreamRunning.store(false);
+    mTxCyclicRunning.store(false);
+}
+
+LMS_StreamBoard::~LMS_StreamBoard()
+{
+    StopReceiving();
+    delete mRxFIFO;
+    delete mTxFIFO;
+}
+
+/** @brief Crates threads for packets receiving, processing and transmitting
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::StartReceiving(unsigned int fftSize)
+{
+    if (mStreamRunning.load() == true)
+        return FAILURE;
+    if (mDataPort->IsOpen() == false)
+        return FAILURE;
+    mRxFIFO->reset();    
+    stopRx.store(false);
+    threadRx = std::thread(ReceivePackets, this);
+    mStreamRunning.store(true);
+    return SUCCESS;
+}
+
+/** @brief Stops receiving, processing and transmitting threads
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::StopReceiving()
+{
+    if (mStreamRunning.load() == false)
+        return FAILURE;
+    stopTx.store(true);
+    stopRx.store(true);    
+    threadRx.join();
+    mStreamRunning.store(false);
+    return SUCCESS;
+}
+
+/** @brief Function dedicated for receiving data samples from board
+*/
+void LMS_StreamBoard::ReceivePackets(LMS_StreamBoard* pthis)
+{
+    SamplesPacket pkt;
+    int samplesCollected = 0;
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+
+    const int buffer_size = 65536;// 4096;
+    const int buffers_count = 16; // must be power of 2
+    const int buffers_count_mask = buffers_count - 1;
+    int handles[buffers_count];
+    memset(handles, 0, sizeof(int)*buffers_count);
+    char *buffers = NULL;
+    buffers = new char[buffers_count*buffer_size];
+    if (buffers == 0)
+    {
+        printf("error allocating buffers\n");
+        return;
+    }
+    memset(buffers, 0, buffers_count*buffer_size);
+
+    //USB FIFO reset
+    LMScomms::GenericPacket ctrPkt;
+    ctrPkt.cmd = CMD_USB_FIFO_RST;
+    ctrPkt.outBuffer.push_back(0x01);
+    pthis->mDataPort->TransferPacket(ctrPkt);
+    ctrPkt.outBuffer[0] = 0x00;
+    pthis->mDataPort->TransferPacket(ctrPkt);
+
+    uint16_t regVal = pthis->SPI_read(0x0005);
+    pthis->SPI_write(0x0005, regVal | 0x4);
+
+    for (int i = 0; i<buffers_count; ++i)
+        handles[i] = pthis->mDataPort->BeginDataReading(&buffers[i*buffer_size], buffer_size);
+
+    int bi = 0;
+    int packetsReceived = 0;
+    unsigned long BytesReceived = 0;
+    int m_bufferFailures = 0;    
+    short sample;
+
+    bool frameStart = pthis->mRxFrameStart.load();
+    while (pthis->stopRx.load() == false)
+    {
+        if (pthis->mDataPort->WaitForReading(handles[bi], 1000) == false)
+            ++m_bufferFailures;
+
+        long bytesToRead = buffer_size;
+        long bytesReceived = pthis->mDataPort->FinishDataReading(&buffers[bi*buffer_size], bytesToRead, handles[bi]);
+        if (bytesReceived > 0)
+        {
+            ++packetsReceived;
+            BytesReceived += bytesReceived;
+            char* bufStart = &buffers[bi*buffer_size];
+            
+            for (int p = 0; p < bytesReceived; p+=2)
+            {
+                if (samplesCollected == 0) //find frame start
+                {
+                    int frameStartOffset = FindFrameStart(&bufStart[p], bytesReceived-p, frameStart);
+                    if (frameStartOffset < 0) 
+                        break; //frame start was not found, move on to next buffer
+                    p += frameStartOffset;
+                }
+                sample = (bufStart[p+1] & 0x0F);
+                sample = sample << 8;
+                sample |= (bufStart[p] & 0xFF);
+                sample = sample << 4;
+                sample = sample >> 4;
+                pkt.iqdata[samplesCollected] = sample;
+                ++samplesCollected;
+                if (pkt.samplesCount == samplesCollected)
+                {
+                    samplesCollected = 0;
+                    if (pthis->mRxFIFO->push_back(pkt, 200) == false)
+                        ++m_bufferFailures;
+                }
+            }
+        }
+        else
+        {
+            ++m_bufferFailures;
+        }
+
+        t2 = chrono::high_resolution_clock::now();
+        long timePeriod = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
+        if (timePeriod >= 1000)
+        {
+            // periodically update frame start, user might change it during operation
+            frameStart = pthis->mRxFrameStart.load();
+            float m_dataRate = 1000.0*BytesReceived / timePeriod;
+            t1 = t2;
+            BytesReceived = 0;
+            LMS_StreamBoard_FIFO<SamplesPacket>::Status rxstats = pthis->mRxFIFO->GetStatus();
+
+            pthis->mRxDataRate.store(m_dataRate);
+            pthis->mRxFIFOfilled.store(100.0*rxstats.filledElements / rxstats.maxElements);
+#ifndef NDEBUG
+            printf("Rx: %.1f%% \t rate: %.0f kB/s failures:%i\n", 100.0*rxstats.filledElements / rxstats.maxElements, m_dataRate / 1000.0, m_bufferFailures);
+#endif
+            m_bufferFailures = 0;
+        }
+
+        // Re-submit this request to keep the queue full
+        memset(&buffers[bi*buffer_size], 0, buffer_size);
+        handles[bi] = pthis->mDataPort->BeginDataReading(&buffers[bi*buffer_size], buffer_size);
+        bi = (bi + 1) & buffers_count_mask;
+    }
+    pthis->mDataPort->AbortReading();
+    for (int j = 0; j<buffers_count; j++)
+    {
+        long bytesToRead = buffer_size;
+        pthis->mDataPort->WaitForReading(handles[j], 1000);
+        pthis->mDataPort->FinishDataReading(&buffers[j*buffer_size], bytesToRead, handles[j]);
+    }
+
+    regVal = pthis->SPI_read(0x0005);
+    pthis->SPI_write(0x0005, regVal & ~0x4);
+
+    delete[] buffers;
+#ifndef NDEBUG
+    printf("Rx finished\n");
+#endif
+}
+
+/** @brief Function dedicated for transmitting samples to board
+*/
+void LMS_StreamBoard::TransmitPackets(LMS_StreamBoard* pthis)
+{
+    const int packetsToBatch = 16;
+    const int buffer_size = sizeof(SamplesPacket)*packetsToBatch;
+    const int buffers_count = 16; // must be power of 2
+    const int buffers_count_mask = buffers_count - 1;
+    int handles[buffers_count];
+    memset(handles, 0, sizeof(int)*buffers_count);
+    char *buffers = NULL;
+    buffers = new char[buffers_count*buffer_size];
+    if (buffers == 0)
+    {
+        printf("error allocating buffers\n");
+    }
+    memset(buffers, 0, buffers_count*buffer_size);
+    bool *bufferUsed = new bool[buffers_count];
+    memset(bufferUsed, 0, sizeof(bool)*buffers_count);
+
+    int bi = 0; //buffer index
+
+    SamplesPacket* pkt = new SamplesPacket[packetsToBatch];
+    int m_bufferFailures = 0;
+    long bytesSent = 0;
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+    long totalBytesSent = 0;
+
+    unsigned long outputCounter = 0;
+
+    while (pthis->stopTx.load() == false)
+    {
+        for (int i = 0; i < packetsToBatch; ++i)
+        {
+            if (pthis->mTxFIFO->pop_front(&pkt[i], 200) == false)
+            {
+                printf("Error popping from TX\n");
+                if (pthis->stopTx.load() == false)
+                    break;
+                continue;
+            }
+        }
+        //wait for desired slot buffer to be transferred
+        if (bufferUsed[bi])
+        {
+            if (pthis->mDataPort->WaitForSending(handles[bi], 1000) == false)
+            {
+                ++m_bufferFailures;
+            }
+            // Must always call FinishDataXfer to release memory of contexts[i]
+            long bytesToSend = buffer_size;
+            bytesSent = pthis->mDataPort->FinishDataSending(&buffers[bi*buffer_size], bytesToSend, handles[bi]);
+            if (bytesSent > 0)
+                totalBytesSent += bytesSent;
+            else
+                ++m_bufferFailures;
+            bufferUsed[bi] = false;
+        }
+
+        memcpy(&buffers[bi*buffer_size], &pkt[0], sizeof(SamplesPacket)*packetsToBatch);
+        handles[bi] = pthis->mDataPort->BeginDataSending(&buffers[bi*buffer_size], buffer_size);
+        bufferUsed[bi] = true;
+
+        t2 = chrono::high_resolution_clock::now();
+        long timePeriod = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
+        if (timePeriod >= 1000)
+        {
+            float m_dataRate = 1000.0*totalBytesSent / timePeriod;
+            t1 = t2;
+            totalBytesSent = 0;
+#ifndef NDEBUG
+            cout << "Tx rate: " << m_dataRate / 1000 << " kB/s\t failures: " << m_bufferFailures << endl;
+#endif
+            LMS_StreamBoard_FIFO<SamplesPacket>::Status txstats = pthis->mTxFIFO->GetStatus();
+            pthis->mTxDataRate.store(m_dataRate);
+            pthis->mTxFIFOfilled.store(100.0*txstats.filledElements / txstats.maxElements);
+            m_bufferFailures = 0;
+        }
+        bi = (bi + 1) & buffers_count_mask;
+    }
+
+    // Wait for all the queued requests to be cancelled
+    pthis->mDataPort->AbortSending();
+    for (int j = 0; j<buffers_count; j++)
+    {
+        long bytesToSend = buffer_size;
+        if (bufferUsed[bi])
+        {
+            pthis->mDataPort->WaitForSending(handles[j], 1000);
+            pthis->mDataPort->FinishDataSending(&buffers[j*buffer_size], bytesToSend, handles[j]);
+        }
+    }
+
+    delete[] buffers;
+    delete[] bufferUsed;
+    delete[] pkt;
+#ifndef NDEBUG
+    printf("Tx finished\n");
+#endif
+}
+
+/** @brief Returns current data state for user interface
+*/
+LMS_StreamBoard::DataToGUI LMS_StreamBoard::GetIncomingData()
+{
+    std::unique_lock<std::mutex> lck(mLockIncomingPacket);
+    return mIncomingPacket;
+}
+
+/** @brief Returns data rate info and Tx Rx FIFO fill percentage
+*/
+LMS_StreamBoard::ProgressStats LMS_StreamBoard::GetStats()
+{
+    ProgressStats stats;
+    stats.RxRate_Bps = mRxDataRate.load();
+    stats.TxRate_Bps = mTxDataRate.load();
+    stats.RxFIFOfilled = mRxFIFOfilled.load();
+    stats.TxFIFOfilled = mTxFIFOfilled.load();
+    return stats;
+}
+
+/** @brief Helper function to write board spi regiters
+    @param address spi address
+    @param data register value
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::SPI_write(uint16_t address, uint16_t data)
+{
+    assert(mDataPort != nullptr);
+    LMScomms::GenericPacket ctrPkt;
+    ctrPkt.cmd = CMD_BRDSPI_WR;
+    ctrPkt.outBuffer.push_back((address >> 8) & 0xFF);
+    ctrPkt.outBuffer.push_back(address & 0xFF);
+    ctrPkt.outBuffer.push_back((data >> 8) & 0xFF);
+    ctrPkt.outBuffer.push_back(data & 0xFF);
+    mDataPort->TransferPacket(ctrPkt);
+    return ctrPkt.status == 1 ? SUCCESS : FAILURE;
+}
+
+/** @brief Helper function to read board spi registers
+    @param address spi address
+    @return register value
+*/
+uint16_t LMS_StreamBoard::SPI_read(uint16_t address)
+{
+    assert(mDataPort != nullptr);
+    LMScomms::GenericPacket ctrPkt;
+    ctrPkt.cmd = CMD_BRDSPI_RD;
+    ctrPkt.outBuffer.push_back((address >> 8) & 0xFF);
+    ctrPkt.outBuffer.push_back(address & 0xFF);
+    mDataPort->TransferPacket(ctrPkt);
+    if (ctrPkt.status == STATUS_COMPLETED_CMD && ctrPkt.inBuffer.size() >= 4)
+        return ctrPkt.inBuffer[2] * 256 + ctrPkt.inBuffer[3];
+    else
+        return 0;
+}
+
+/** @brief Changes which frame start to look for when receiving data
+*/
+void LMS_StreamBoard::SetRxFrameStart(const bool startValue)
+{
+    mRxFrameStart.store(startValue);
+}
+
+/** @brief Searches for frame start index in given buffer
+    @return frameStart index in buffer, -1 if frame start was not found
+    Frame start indicator is 13th bit inside each I and Q sample
+*/
+int LMS_StreamBoard::FindFrameStart(const char* buffer, const int bufLen, const bool frameStart)
+{
+    int startIndex = -1;
+    for (int i = 0; i < bufLen; i+=2)
+        if ((buffer[i+1] & 0x10)>0 == frameStart)
+        {
+            startIndex = i;
+            break;
+        }
+    return startIndex;
+}
+
+/** @brief Starts a thread for continuous cyclic transmitting of given samples
+    @param isamples I channel samples
+    @param qsamples Q channel samples
+    @param framesCount number of samples in given arrays
+    @return 0:success, other:failure
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::StartCyclicTransmitting(const int16_t* isamples, const int16_t* qsamples, uint32_t framesCount)
+{   
+    if (mDataPort->IsOpen() == false)
+        return FAILURE;
+
+    stopTxCyclic.store(false);
+    threadTxCyclic = std::thread([](LMS_StreamBoard* pthis)
+    {
+        const int buffer_size = 65536;
+        const int buffers_count = 16; // must be power of 2
+        const int buffers_count_mask = buffers_count - 1;
+        int handles[buffers_count];
+        memset(handles, 0, sizeof(int)*buffers_count);
+        char *buffers = NULL;
+        buffers = new char[buffers_count*buffer_size];
+        if (buffers == 0)
+        {
+            printf("error allocating buffers\n");
+            return 0;
+        }
+        memset(buffers, 0, buffers_count*buffer_size);
+
+        //timers for data rate calculation
+        auto t1 = chrono::high_resolution_clock::now();
+        auto t2 = chrono::high_resolution_clock::now();
+
+        int bi = 0; //buffer index
+
+        //setup output data
+        int dataIndex = 0;
+        for (int i = 0; i < buffers_count; ++i)
+        {
+            for (int j = 0; j < buffer_size; ++j)
+            {
+                buffers[i*buffer_size + j] = pthis->mCyclicTransmittingSourceData[dataIndex];
+                ++dataIndex;
+                if (dataIndex > pthis->mCyclicTransmittingSourceData.size())
+                    dataIndex = 0;
+            }
+        }
+
+        for (int i = 0; i < buffers_count; ++i)
+            handles[i] = pthis->mDataPort->BeginDataSending(&buffers[i*buffer_size], buffer_size);
+
+        int m_bufferFailures = 0;
+        int bytesSent = 0;
+        int totalBytesSent = 0;
+        int sleepTime = 200;
+        while (pthis->stopTxCyclic.load() != true)
+        {
+            if (pthis->mDataPort->WaitForSending(handles[bi], 1000) == false)
+            {
+                ++m_bufferFailures;
+            }
+            long bytesToSend = buffer_size;
+            bytesSent = pthis->mDataPort->FinishDataSending(&buffers[bi*buffer_size], bytesToSend, handles[bi]);
+            if (bytesSent > 0)
+                totalBytesSent += bytesSent;
+            else
+            {
+                ++m_bufferFailures;
+            }
+
+            t2 = chrono::high_resolution_clock::now();
+            long timePeriod = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
+            if (timePeriod >= 1000)
+            {
+                pthis->mTxDataRate.store(1000.0*totalBytesSent / timePeriod);
+                t1 = t2;
+                totalBytesSent = 0;
+#ifndef NDEBUG
+                printf("Upload rate: %f\t failures:%li\n", 1000.0*totalBytesSent / timePeriod, m_bufferFailures);
+#endif
+                m_bufferFailures = 0;
+            }
+
+            //fill up next buffer		
+            for (int j = 0; j < buffer_size; ++j)
+            {
+                buffers[bi*buffer_size + j] = pthis->mCyclicTransmittingSourceData[dataIndex];
+                ++dataIndex;
+                if (dataIndex >= pthis->mCyclicTransmittingSourceData.size())
+                    dataIndex = 0;
+            }
+
+            // Re-submit this request to keep the queue full
+            handles[bi] = pthis->mDataPort->BeginDataSending(&buffers[bi*buffer_size], buffer_size);
+            bi = (bi + 1) & buffers_count_mask;
+        }
+
+        // Wait for all the queued requests to be cancelled
+        pthis->mDataPort->AbortSending();
+        for (int j = 0; j < buffers_count; j++)
+        {
+            long bytesToSend = buffer_size;
+            pthis->mDataPort->WaitForSending(handles[j], 1000);
+            pthis->mDataPort->FinishDataSending(&buffers[j*buffer_size], bytesToSend, handles[j]);
+        }
+#ifndef NDEBUG
+        printf("Cyclic transmitting FULLY STOPPED\n");
+#endif
+        delete[] buffers;
+        return 0;
+    }, this);
+    mTxCyclicRunning.store(true);
+
+    return LMS_StreamBoard::SUCCESS;
+}
+
+/** @brief Stops cyclic transmitting thread
+*/
+LMS_StreamBoard::Status LMS_StreamBoard::StopCyclicTransmitting()
+{
+    stopTxCyclic.store(true);
+    if (mTxCyclicRunning.load() == true)
+    {
+        threadTxCyclic.join();
+        mTxCyclicRunning.store(false);
+    }
+    return LMS_StreamBoard::SUCCESS;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.h
new file mode 100644
index 0000000000000000000000000000000000000000..99b363633607c8fb7d8b88c316bb1c44cfd68da8
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard.h
@@ -0,0 +1,107 @@
+#ifndef STREAM_BOARD_API_H
+#define STREAM_BOARD_API_H
+
+#include <stdint.h>
+#include <mutex>
+#include <atomic>
+#include <thread>
+#include "LMS_StreamBoard_FIFO.h"
+
+class LMScomms;
+
+class LMS_StreamBoard
+{
+public:
+    struct SamplesPacket
+    {
+    public:
+        SamplesPacket() : channel(0)
+        {}
+        ~SamplesPacket()
+        {}
+
+        SamplesPacket& operator=(const SamplesPacket& obj)
+        {
+            memcpy(this->iqdata, obj.iqdata, sizeof(float)*samplesCount);
+            this->channel = obj.channel;
+            return *this;
+        }
+        const static int samplesCount = 32768;
+        float iqdata[samplesCount];
+        int channel;
+    };
+
+
+    enum Status
+    {
+        SUCCESS,
+        FAILURE,
+    };
+
+    static Status CaptureIQSamples(LMScomms* serPort, int16_t *isamples, int16_t *qsamples, uint32_t framesCount, bool frameStart);
+    static Status UploadIQSamples(LMScomms* serPort, int16_t *isamples, int16_t *qsamples, uint32_t framesCount);
+    static Status ConfigurePLL(LMScomms *serPort, const float fOutTx_MHz, const float fOutRx_MHz, const float phaseShift_deg);
+
+    struct DataToGUI
+    {
+        std::vector<double> samplesI;
+        std::vector<double> samplesQ;
+        std::vector<double> fftBins_dbFS;
+        float nyquist_MHz;
+    };
+
+    struct ProgressStats
+    {
+        float RxRate_Bps;
+        float TxRate_Bps;
+        float RxFIFOfilled;
+        float TxFIFOfilled;
+    };
+
+    LMS_StreamBoard(LMScomms* dataPort);
+    virtual ~LMS_StreamBoard();
+
+    void SetRxFrameStart(const bool startValue);
+    virtual Status StartReceiving(unsigned int fftSize);
+    virtual Status StopReceiving();
+
+	virtual Status StartCyclicTransmitting(const int16_t* isamples, const int16_t* qsamples, uint32_t framesCount);
+    virtual Status StopCyclicTransmitting();
+
+    DataToGUI GetIncomingData();
+    ProgressStats GetStats();
+
+    Status SPI_write(uint16_t address, uint16_t data);
+    uint16_t SPI_read(uint16_t address);
+protected:
+    static int FindFrameStart(const char* buffer, const int bufLen, const bool frameStart);
+    std::mutex mLockIncomingPacket;
+    DataToGUI mIncomingPacket;
+
+    LMS_StreamBoard_FIFO<SamplesPacket> *mRxFIFO;
+    LMS_StreamBoard_FIFO<SamplesPacket> *mTxFIFO;
+
+    static void ReceivePackets(LMS_StreamBoard* pthis);
+    static void TransmitPackets(LMS_StreamBoard* pthis);
+
+    std::atomic_bool mRxFrameStart;
+    std::atomic_bool mStreamRunning;
+    std::atomic_bool stopRx;
+    std::atomic_bool stopTx;
+
+    std::thread threadRx;
+    std::thread threadTx;
+    LMScomms* mDataPort;
+
+    std::atomic<unsigned long> mRxDataRate;
+    std::atomic<unsigned long> mTxDataRate;
+    std::atomic<int> mRxFIFOfilled;
+    std::atomic<int> mTxFIFOfilled;
+
+    std::vector<int16_t> mCyclicTransmittingSourceData;
+    std::atomic_bool mTxCyclicRunning;
+    std::thread threadTxCyclic;
+    std::atomic_bool stopTxCyclic;
+};
+#endif
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard_FIFO.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard_FIFO.h
new file mode 100644
index 0000000000000000000000000000000000000000..833f7a37c008c63123ca4774e8477b78037ca8a8
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/LMS_StreamBoard_FIFO.h
@@ -0,0 +1,122 @@
+/**
+@file 	LMS_StreamBoard_FIFO.h
+@author Lime Microsystems (www.limemicro.com)
+@brief 	blocking FIFO for packets storing
+*/
+
+#ifndef LMS_STREAMBOARD_FIFO_H
+#define LMS_STREAMBOARD_FIFO_H
+
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <vector>
+#include <mutex>
+#include <chrono>
+#include <condition_variable>
+
+template<class T>
+class LMS_StreamBoard_FIFO
+{
+private:
+    LMS_StreamBoard_FIFO(){};
+public:
+    struct Status
+    {
+        uint32_t maxElements;
+        uint32_t filledElements;
+        uint32_t head;
+        uint32_t tail;
+    };
+
+    LMS_StreamBoard_FIFO(uint64_t FIFO_length)
+    {        
+        mHead = 0;
+        mTail = 0;
+		mElements.resize(FIFO_length);    
+		mElementsFilled = 0;
+    }
+
+    ~LMS_StreamBoard_FIFO()
+    {
+        
+    }
+
+    /** @brief Copies given src element to queue.
+        @param src Source data
+        @return true if element was inserted
+
+        Copies element to queue. This function blocks until element is copied to
+        queue or certain amount of time has passed.
+    */
+    bool push_back(const T &src, unsigned int timeout_ms = 200)
+    {        
+        std::unique_lock<std::mutex> lck(mElementsLock);         
+        while (mElementsFilled == mElements.size())
+        {
+            if (canWrite.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                return false;            
+        }
+        memcpy(&mElements[mTail], &src, sizeof(T));		
+		mTail = (mTail+1) % mElements.size();
+		++mElementsFilled;
+        canRead.notify_one();
+		return true;		
+    }
+
+    /** @brief Copies and removes first element from queue to dest.
+        @param dest destination container for data
+        @return true if element was copied
+        Copies element from queue to destination and then removes it.
+        This function blocks until element is returned, or certain amount of time
+        has passed.
+    */
+    bool pop_front(T *dest, unsigned int timeout_ms = 200)
+    {
+        assert(dest != nullptr);   
+        std::unique_lock<std::mutex> lck(mElementsLock);
+        while (mElementsFilled == 0)
+        {
+            if (canRead.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                return false;
+        }                
+        if (mElementsFilled == 0)
+            return false;
+        *dest = mElements[mHead];
+        memcpy(dest, &mElements[mHead], sizeof(T));
+        mHead = (mHead + 1) % mElements.size();
+        --mElementsFilled;
+        canWrite.notify_one();
+        return true;        
+    }
+    void reset()
+    {
+        std::unique_lock<std::mutex> lck(mElementsLock);
+        mElementsFilled = 0;
+        mHead = 0;
+        mTail = 0;
+    }    
+
+    Status GetStatus()
+    {
+        Status stats;
+        std::unique_lock<std::mutex> lck(mElementsLock);
+        stats.maxElements = mElements.size();
+        stats.filledElements = mElementsFilled;
+        stats.head = mHead;
+        stats.tail = mTail;
+        return stats;
+    };
+
+protected:
+    uint32_t mHead; //reading pos
+    uint32_t mTail; //writing pos
+	uint32_t mElementsFilled;
+
+    std::mutex mElementsLock; // condition variable for critical section  	
+    std::vector<T> mElements;
+    std::condition_variable canWrite;
+    std::condition_variable canRead;
+};
+
+#endif // LMS_STREAMBOARD_FIFO_H
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/lms7002_defines.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/lms7002_defines.h
new file mode 100644
index 0000000000000000000000000000000000000000..c098dfe9657d2e80be7ad38599124090ed96cfae
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard/lms7002_defines.h
@@ -0,0 +1,215 @@
+/**
+@file	lms7002_defines.h
+@author Lime Microsystems
+@brief	enumerations of available LMS7002M commands and statuses
+*/
+#pragma once
+
+const int LMS_RST_DEACTIVATE = 0;
+const int LMS_RST_ACTIVATE = 1;
+const int LMS_RST_PULSE = 2;
+
+enum eLMS_DEV
+{
+	LMS_DEV_UNKNOWN,
+	LMS_DEV_EVB6,
+	LMS_DEV_DIGIGREEN,
+	LMS_DEV_DIGIRED,
+	LMS_DEV_EVB7,
+	LMS_DEV_ZIPPER,
+	LMS_DEV_SOCKETBOARD,
+	LMS_DEV_EVB7V2,
+	LMS_DEV_STREAM,
+	LMS_DEV_NOVENA,
+	LMS_DEV_DATASPARK,
+	LMS_DEV_RFSPARK,
+	LMS_DEV_LMS6002USB,
+	LMS_DEV_RFESPARK,
+	
+	LMS_DEV_COUNT
+};
+
+const char LMS_DEV_NAMES[][80] = 
+{
+	"UNKNOWN",
+	"EVB6",
+	"DigiGreen",
+	"DigiRed",
+	"EVB7",
+	"ZIPPER",
+	"Socket Board",
+	"EVB7_v2",
+	"Stream",
+	"Novena",
+	"DataSpark",
+	"RF-Spark",
+	"LMS6002-USB Stick",
+	"RF-ESpark"
+};
+
+static const char* GetDeviceName(const eLMS_DEV device)
+{
+    if (LMS_DEV_UNKNOWN < device && device < LMS_DEV_COUNT)
+        return LMS_DEV_NAMES[device];
+    else
+        return LMS_DEV_NAMES[LMS_DEV_UNKNOWN];
+}
+
+enum eEXP_BOARD 
+{
+	EXP_BOARD_UNKNOWN,
+	EXP_BOARD_UNSUPPORTED,
+	EXP_BOARD_NO,
+	EXP_BOARD_MYRIAD1,
+	EXP_BOARD_MYRIAD2,
+	EXP_BOARD_MYRIAD_NOVENA,
+	EXP_BOARD_HPM1000,
+	EXP_BOARD_MYRIAD7,
+	EXP_BOARD_HPM7,
+	
+	EXP_BOARD_COUNT
+};
+
+const char EXP_BOARD_NAMES[][80] = 
+{
+	"UNKNOWN", 
+	"UNSUPPORTED", 
+	"NOT AVAILABLE",
+	"Myriad1",
+	"Myriad2",
+	"Novena",
+	"HPM1000",
+	"Myriad7",
+	"HMP7"
+};
+
+static const char* GetExpansionBoardName(const eEXP_BOARD board)
+{
+    if (EXP_BOARD_UNKNOWN < board && board < EXP_BOARD_COUNT)
+        return EXP_BOARD_NAMES[board];
+    else
+        return EXP_BOARD_NAMES[EXP_BOARD_UNKNOWN];
+}
+			
+struct LMS64C_Info
+{
+	unsigned char firmware;
+    unsigned char deviceType;
+    unsigned char protocol;
+    unsigned char hardware;
+    unsigned char expansionBoard;
+};
+
+enum eCMD_LMS
+{
+    CMD_GET_INFO = 0x00,
+    CMD_LMS6002_RST = 0x10,
+    ///Writes data to SI5356 synthesizer via I2C
+    CMD_SI5356_WR = 0x11,
+    ///Reads data from SI5356 synthesizer via I2C
+    CMD_SI5356_RD = 0x12,
+    ///Writes data to SI5351 synthesizer via I2C
+    CMD_SI5351_WR = 0x13,
+    ///Reads data from SI5351 synthesizer via I2C
+    CMD_SI5351_RD = 0x14,
+    ///PanelBus DVI (HDMI) Transmitter control
+    CMD_TFP410_WR = 0x15,
+    ///PanelBus DVI (HDMI) Transmitter control
+    CMD_TFP410_RD = 0x16,
+    ///Sets new LMS7002M chip’s RESET pin level (0, 1, pulse)
+    CMD_LMS7002_RST = 0x20,
+    ///Writes data to LMS7002M chip via SPI
+    CMD_LMS7002_WR = 0x21,
+    ///Reads data from LMS7002M chip via SPI
+    CMD_LMS7002_RD = 0x22,
+    ///Writes data to LMS6002 chip via SPI
+    CMD_LMS6002_WR = 0x23,
+    ///Reads data from LMS6002 chip via SPI
+    CMD_LMS6002_RD = 0x24,
+
+    CMD_LMS_LNA = 0x2A,
+    CMD_LMS_PA = 0x2B,
+
+    CMD_PROG_MCU = 0x2C,
+    ///Writes data to ADF4002 chip via SPI
+    CMD_ADF4002_WR = 0x31,
+
+    CMD_USB_FIFO_RST = 0x40,
+    CMD_PE636040_WR = 0x41,
+	CMD_PE636040_RD = 0x42,
+
+	CMD_GPIO_WR = 0x51,
+	CMD_GPIO_RD = 0x52,
+
+	CMD_ALTERA_FPGA_GW_WR = 0x53,
+	CMD_ALTERA_FPGA_GW_RD = 0x54,
+
+	CMD_BRDSPI_WR = 0x55,//16 bit spi for stream, dataspark control
+    CMD_BRDSPI_RD = 0x56,//16 bit spi for stream, dataspark control
+	CMD_BRDSPI8_WR = 0x57, //8 + 8 bit spi for stream, dataspark control
+	CMD_BRDSPI8_RD = 0x58, //8 + 8 bit spi for stream, dataspark control
+	
+	CMD_BRDCONF_WR = 0x5D, //write config data to board
+	CMD_BRDCONF_RD = 0x5E, //read config data from board
+	
+	CMD_ANALOG_VAL_WR = 0x61, //write analog value
+	CMD_ANALOG_VAL_RD = 0x62, //read analog value
+
+	CMD_MYRIAD_RST = 0x80,
+	CMD_MYRIAD_WR = 0x81,
+	CMD_MYRIAD_RD = 0x82,
+	CMD_MYRIAD_PROG = 0x8C
+};
+
+enum eCMD_STATUS
+{
+    STATUS_UNDEFINED,
+    STATUS_COMPLETED_CMD,
+    STATUS_UNKNOWN_CMD,
+    STATUS_BUSY_CMD,
+    STATUS_MANY_BLOCKS_CMD,
+    STATUS_ERROR_CMD,
+    STATUS_WRONG_ORDER_CMD,
+	STATUS_RESOURCE_DENIED_CMD,
+    STATUS_COUNT
+};
+
+static const char  status_text[][32]=
+{
+    "Undefined/Failure",
+    "Completed",
+    "Unknown command",
+    "Busy",
+    "Too many blocks",
+    "Error",
+    "Wrong order",
+    "Resource denied"
+};
+
+static const char* status2string(const int status)
+{
+    if(status >= 0 && status < STATUS_COUNT)
+        return status_text[status];
+    else
+        return "Unknown status";
+}
+
+enum eADC_UNITS
+{
+	RAW,
+	VOLTAGE,
+	CURRENT,
+	RESISTANCE,
+	POWER,
+	ADC_UNITS_COUNT
+};
+
+static const char  adc_units_text[][8] = {"", "V", "A", "Ohm", "W"};
+
+static const char* adcUnits2string(const unsigned units)
+{
+	if (units < ADC_UNITS_COUNT)
+		return adc_units_text[units];
+	else
+		return " unknown";
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/CMakeLists.txt b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d9124aaef13d009fedc0b4fb5dc7b1998701fde2
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(ENABLE_USB_CONNECTION "YES" CACHE BOOL INTERNAL)
+set(ENABLE_SPI_CONNECTION "NO" CACHE BOOL INTERNAL)
+set(CONNECTION_MANAGER_DIR connectionManager)
+set(connectionManager_src_files
+	ConnectionManager.cpp
+	ConnectionCOM.cpp
+	ConnectionManager.h
+	ConnectionCOM.h
+	lmsComms.h
+	lmsComms.cpp
+)
+if(ENABLE_USB_CONNECTION)
+	list(APPEND connectionManager_src_files ConnectionUSB.cpp ConnectionUSB.h)
+    add_definitions(-DENABLE_USB_CONNECTION)
+endif()
+if(ENABLE_SPI_CONNECTION)
+	list(APPEND connectionManager_src_files ConnectionSPI.cpp ConnectionSPI.h)
+    add_definitions(-DENABLE_SPI_CONNECTION)
+endif()
+
+add_library(ConnectionManager STATIC ${connectionManager_src_files})
+target_include_directories(ConnectionManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(WIN32 AND ENABLE_USB_CONNECTION)
+	find_package(CyAPI REQUIRED)
+	LINK_DIRECTORIES(${CYAPI_LIBRARIES})	
+	include_directories(${CYAPI_INCLUDE_DIRS})
+	set(CONNECTION_MANAGER_LIBS ${CYAPI_LIBRARIES} SetupAPI)
+	target_link_libraries(ConnectionManager ${CONNECTION_MANAGER_LIBS})
+endif()
+if(UNIX AND ENABLE_USB_CONNECTION)	
+	set(CONNECTION_MANAGER_LIBS usb-1.0 -lpthread)
+	target_link_libraries(ConnectionManager ${CONNECTION_MANAGER_LIBS})
+endif()
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6c7fc0d8290d5c26a8ae575fbcc98b4058cae124
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.cpp
@@ -0,0 +1,596 @@
+/**
+    @file   ConnectionCOM.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief  Implementation of communications through COM port
+*/
+
+#include "ConnectionCOM.h"
+
+#include "string.h"
+#ifdef __unix__
+#include <fstream>
+#include <errno.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <iostream>
+#include <stdio.h>
+#endif // LINUX
+
+const int COM_RETRY_INTERVAL = 20; //ms
+const int COM_TOTAL_TIMEOUT = 300; //ms
+
+/** @brief Initializes com port connection
+*/
+ConnectionCOM::ConnectionCOM()
+{
+    currentDeviceIndex = -1;
+	connected = false;
+	comPortList.clear();
+	m_deviceNames.clear();
+	m_connectionType = COM_PORT;
+#ifndef __unix__
+	hComm = INVALID_HANDLE_VALUE;
+#else
+    hComm = -1;
+#endif
+	comBaudrate = 9600;
+}
+
+/** @brief When object is destroyed it closes it's opened COM port
+*/
+ConnectionCOM::~ConnectionCOM()
+{
+	Close();
+}
+
+/** @brief Opens connection to first found chip
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open()
+{
+	comPortList.clear();
+	if(comPortList.size() == 0)
+		FindAllComPorts();
+
+	m_deviceNames.clear();
+	if(m_deviceNames.size() == 0)
+		RefreshDeviceList();
+
+	for(unsigned int i=0; i<m_deviceNames.size(); i++)
+	{
+		if( Open(i) == SUCCESS)
+		{
+			currentDeviceIndex = i;
+			return SUCCESS;
+		}
+	}
+	return FAILURE;
+}
+
+/** @brief Opens connection to selected chip
+    @param index chip index in device list
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open(unsigned index)
+{
+    unsigned int toOpen = index;
+	Close();
+	if(toOpen < m_deviceNames.size() && m_deviceNames.size() > 0 )
+	{
+		comPortName = m_deviceNames[toOpen];
+		IConnection::DeviceStatus status = Open(comPortName.c_str(), comBaudrate);
+		if( status == SUCCESS )
+			currentDeviceIndex = toOpen;
+        return status;
+	}
+	return FAILURE;
+}
+
+/** @brief Closes connection to chip
+*/
+void ConnectionCOM::Close()
+{
+    connected = false;
+    currentDeviceIndex = -1;
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE)
+	{
+		SetCommTimeouts(hComm, &m_ctmoOld);
+		CloseHandle(hComm);
+	}
+	hComm = INVALID_HANDLE_VALUE;
+#else
+    if( hComm >= 0)
+    {
+        close(hComm);
+    }
+    hComm = -1;
+#endif
+}
+
+/** @brief Returns whether chip is connected
+    @return chip is connected
+*/
+bool ConnectionCOM::IsOpen()
+{
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE && TestConnectivity() )
+		return true;
+#else
+    if( hComm != -1 && TestConnectivity() )
+        return true;
+#endif
+    return false;
+}
+
+int ConnectionCOM::GetOpenedIndex()
+{
+    return currentDeviceIndex;
+}
+
+/** @brief Sends data through COM port
+    @param buffer data buffer to send
+    @param length size of data buffer
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes sent
+*/
+int ConnectionCOM::Write(const unsigned char *buffer, int length, int timeout_ms)
+{
+    if(timeout_ms == 0)
+    {
+        timeout_ms = COM_TOTAL_TIMEOUT;
+    }
+    int retryCount = 0;
+    const int maxRetries = (timeout_ms/COM_RETRY_INTERVAL) > 1 ? (timeout_ms/COM_RETRY_INTERVAL) : 1;
+    bool status = false;
+#ifndef __unix__
+	unsigned long bytesWriten = 0;
+	m_osWOverlap.InternalHigh = 0;
+
+	for(int i = 0; i<maxRetries && status == false; ++i)
+    {
+        if (!WriteFile(hComm, buffer, length , &bytesWriten, NULL))
+        {
+            status = false;
+        }
+        else
+            status = true;
+        ++retryCount;
+    }
+#else
+    long bytesWriten = 0;
+    for(int i = 0; i<maxRetries && bytesWriten == 0; ++i)
+    {
+        bytesWriten = write(hComm, buffer, length);
+        if(bytesWriten <= 0)
+        {
+//            if(bytesWriten < 0)
+//                MessageLog::getInstance()->write("COM PORT: error writing data\n", LOG_ERROR);
+//            if(bytesWriten == 0)
+//                MessageLog::getInstance()->write("COM PORT: data bytes sent 0\n", LOG_WARNING);
+            status = false;
+        }
+        else
+            status = true;
+        ++retryCount;
+    }
+#endif
+    if(bytesWriten == length)
+        status = true;
+
+	return bytesWriten;
+}
+
+/** @brief Reads data from COM port
+    @param buffer pointer to data buffer for receiving
+    @param length number of bytes to read
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes received
+*/
+int ConnectionCOM::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+    if(timeout_ms == 0)
+    {
+        timeout_ms = COM_TOTAL_TIMEOUT;
+    }
+    int retryCount = 0;
+    const int maxRetries = (timeout_ms/COM_RETRY_INTERVAL) > 1 ? (timeout_ms/COM_RETRY_INTERVAL) : 1;
+    bool status = false;
+
+    memset(buffer, 0, length);
+	long bytesReaded = 0;
+	unsigned long totalBytesReaded = 0;
+	char cRawData[COM_BUFFER_LENGTH];
+	unsigned long bytesToRead = length;
+
+	memset(cRawData, '\0', sizeof(cRawData[0])*COM_BUFFER_LENGTH);
+
+	for(int i=0; i<maxRetries && status == false; ++i)
+    {
+        memset(cRawData, '\0', sizeof(cRawData[0])*COM_BUFFER_LENGTH);
+#ifndef __unix__
+
+        DWORD bytesReceived = 0;
+        if ( !ReadFile(hComm, cRawData, bytesToRead, &bytesReceived, NULL) )
+        {
+            status = false;
+        }
+
+        bytesReaded = bytesReceived;
+#else
+        bytesReaded = read(hComm, cRawData, bytesToRead);
+        if(bytesReaded <= 0)
+        {
+//            if(bytesReaded < 0)
+//                MessageLog::getInstance()->write("COM PORT: error reading data\n", LOG_ERROR);
+//            if(bytesReaded == 0)
+//                MessageLog::getInstance()->write("COM PORT: reading 0 bytes\n", LOG_WARNING);
+            status = false;
+        }
+#endif
+        retryCount++;
+
+        for(int j=0; j<bytesReaded; ++j)
+        {
+            buffer[totalBytesReaded+j] = cRawData[j];
+        }
+
+        totalBytesReaded += bytesReaded;
+        if(totalBytesReaded == bytesToRead)
+            status = true;
+    }
+
+//    ss << " read(" << totalBytesReaded << "): ";
+//    for(unsigned int i=0; i<64; ++i)
+//        ss << int2hex(buffer[i], 1) << " ";
+//    ss <<  " - retries: " << retryCount-1 << endl;
+    //MessageLog::getInstance()->write(ss.str(), LOG_DATA);
+
+//	if(retryCount == maxRetries)
+//        MessageLog::getInstance()->write("COM PORT: read data timeout\n", LOG_WARNING);
+//
+//    if(totalBytesReaded > length)
+//        MessageLog::getInstance()->write("COM PORT: read data corrupted, received length > requested length\n", LOG_ERROR);
+	return totalBytesReaded;
+}
+
+/** @brief Searches for available COM ports and adds them to list
+*/
+void ConnectionCOM::FindAllComPorts()
+{
+    Close();
+	comPortList.clear();
+#ifndef __unix__
+	HKEY hSERIALCOMM;
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HARDWARE\\DEVICEMAP\\SERIALCOMM"),	0, KEY_QUERY_VALUE, &hSERIALCOMM) == ERROR_SUCCESS)
+	{
+		// Get the max value name and max value lengths
+		DWORD dwMaxValueNameLen;
+		DWORD dwMaxValueLen;
+		DWORD dwQueryInfo = RegQueryInfoKey(hSERIALCOMM, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &dwMaxValueNameLen, &dwMaxValueLen, NULL, NULL);
+		if (dwQueryInfo == ERROR_SUCCESS)
+		{
+			DWORD dwMaxValueNameSizeInChars = dwMaxValueNameLen + 1;
+			// Include space for the NULL terminator
+			DWORD dwMaxValueNameSizeInBytes = dwMaxValueNameSizeInChars*sizeof(TCHAR);
+			DWORD dwMaxValueDataSizeInChars = dwMaxValueLen / sizeof(TCHAR) + 1;
+			// Include space for the NULL terminator
+			DWORD dwMaxValueDataSizeInBytes = dwMaxValueDataSizeInChars*sizeof(TCHAR);
+
+			// Allocate some space for the value name and value data
+			TCHAR* szValueName = new TCHAR[dwMaxValueNameSizeInChars];
+			TCHAR* byValue = new TCHAR[dwMaxValueDataSizeInBytes];
+			if (szValueName && byValue)
+			{
+				// Enumerate all the values underneath HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\SERIALCOMM
+				DWORD dwIndex = 0;
+				DWORD dwType;
+				DWORD dwValueNameSize = dwMaxValueNameSizeInChars;
+				DWORD dwDataSize = dwMaxValueDataSizeInBytes;
+				memset(szValueName, 0, dwMaxValueNameSizeInBytes);
+				memset(byValue, 0, dwMaxValueDataSizeInBytes);
+				LONG nEnum = RegEnumValue(hSERIALCOMM, dwIndex, szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE)byValue, &dwDataSize);
+				while (nEnum == ERROR_SUCCESS)
+				{
+					// If the value is of the correct type, then add it to the array
+					if (dwType == REG_SZ)
+					{
+					    char portname[512];
+						TCHAR* szPort = byValue;
+						int nUserNameLenUnicode = lstrlen( szPort ); // Convert all UNICODE characters
+						int nUserNameLen = WideCharToMultiByte( CP_ACP, // ANSI Code Page
+                        0, // No special handling of unmapped chars
+                        (LPCWSTR)szPort, // wide-character string to be converted
+                        nUserNameLenUnicode,
+                        NULL, 0, // No output buffer since we are calculating length
+                        NULL, NULL ); // Unrepresented char replacement - Use Default
+                        TCHAR* pszUserName = new TCHAR[ nUserNameLen ]; // nUserNameLen includes the NULL character
+                        WideCharToMultiByte( CP_ACP, // ANSI Code Page
+                        0, // No special handling of unmapped chars
+						(LPCWSTR)szPort, // wide-character string to be converted
+                        nUserNameLenUnicode,
+                        portname,
+                        nUserNameLen,
+                        NULL, NULL ); // Unrepresented char replacement - Use Default
+						portname[nUserNameLen] = 0;
+#ifdef UNICODE
+                        comPortList.push_back(portname);
+#else
+                        comPortList.push_back(szPort);
+#endif
+					}
+					// Prepare for the next time around
+					dwValueNameSize = dwMaxValueNameSizeInChars;
+					dwDataSize = dwMaxValueDataSizeInBytes;
+					memset(szValueName, 0, dwMaxValueNameSizeInBytes);
+					memset(byValue, 0, dwMaxValueDataSizeInBytes);
+					++dwIndex;
+					nEnum = RegEnumValue(hSERIALCOMM, dwIndex, szValueName,	&dwValueNameSize, NULL, &dwType, (LPBYTE)byValue, &dwDataSize);
+				}
+			}
+			delete szValueName;
+			delete byValue;
+		}
+		// Close the registry key now that we are finished with it
+		RegCloseKey(hSERIALCOMM);
+
+		if (dwQueryInfo != ERROR_SUCCESS)
+			SetLastError(dwQueryInfo);
+	}
+#else
+    char tempBuffer[256];
+    string result = "";
+#warning Currently searching only for ACM connections
+    system( "ls /dev | grep ttyACM > /tmp/foundSerialPorts.txt");
+
+    fstream fin;
+    fin.open("/tmp/foundSerialPorts.txt", ios::in);
+    while(!fin.eof())
+    {
+        fin.getline(tempBuffer, 256);
+        result = "/dev/";
+        result.append(tempBuffer);
+        if( strlen(tempBuffer) > 3 ) //longer than tty
+            comPortList.push_back(result);
+    }
+    fin.close();
+#endif
+}
+
+/** @brief Opens COM port
+    @param comName COM port name
+    @param baudrate COM port baudrate
+    @return 0 on success
+*/
+IConnection::DeviceStatus ConnectionCOM::Open(const char *comName, int baudrate)
+{
+	Close();
+	if (strlen(comName) == 0)
+		return FAILURE;
+
+	DeviceStatus errorCode = SUCCESS;
+
+#ifndef __unix__
+	// Initialize Overlap structures
+	m_osROverlap.Internal = 0;
+	m_osROverlap.InternalHigh = 0;
+	m_osROverlap.Offset = 0;
+	m_osROverlap.OffsetHigh = 0;
+	m_osROverlap.hEvent = CreateEvent(NULL, false, false, NULL);
+
+	m_osWOverlap.Internal = 0;
+	m_osWOverlap.InternalHigh = 0;
+	m_osWOverlap.Offset = 0;
+	m_osWOverlap.OffsetHigh = 0;
+	m_osWOverlap.hEvent = CreateEvent(NULL, false, false, NULL);
+
+	// Initialize DSB structure
+	memset(&m_dcbCommPort, 0, sizeof(m_dcbCommPort));
+
+	m_dcbCommPort.BaudRate = comBaudrate;
+	m_dcbCommPort.fBinary = 1;
+	m_dcbCommPort.fParity = 0;
+	m_dcbCommPort.fOutxCtsFlow = 0;
+	m_dcbCommPort.fOutxDsrFlow = 0;
+	m_dcbCommPort.fDtrControl = 0;
+	m_dcbCommPort.fDsrSensitivity = 0;
+	m_dcbCommPort.fTXContinueOnXoff = 0;
+	m_dcbCommPort.fOutX = 0;
+	m_dcbCommPort.fInX = 0;
+	m_dcbCommPort.fErrorChar = 0;
+	m_dcbCommPort.fNull = 0;
+	m_dcbCommPort.fRtsControl = 0;
+	m_dcbCommPort.fAbortOnError = 0;
+	m_dcbCommPort.fDummy2 = 0;
+	// m_dcbCommPort.wReserved = 0;
+	m_dcbCommPort.XonLim = 512;
+	m_dcbCommPort.XoffLim = 512;
+	m_dcbCommPort.ByteSize = 8;
+	m_dcbCommPort.Parity = 0;
+	m_dcbCommPort.StopBits = 0;
+	//m_dcbCommPort.StopBits = 1;
+	m_dcbCommPort.XonChar = 17;
+	m_dcbCommPort.XoffChar = 19;
+	m_dcbCommPort.ErrorChar = 0;
+	m_dcbCommPort.EofChar = 26;
+	m_dcbCommPort.EvtChar = 0;
+	m_dcbCommPort.wReserved1 = 0;
+	m_dcbCommPort.DCBlength = sizeof(DCB);
+
+	// Initialize Timeout's
+	m_ctmoNew.ReadIntervalTimeout = 50;
+	m_ctmoNew.ReadTotalTimeoutMultiplier = 0;
+	m_ctmoNew.ReadTotalTimeoutConstant = 100; // 1;
+	m_ctmoNew.WriteTotalTimeoutMultiplier = 0;
+	m_ctmoNew.WriteTotalTimeoutConstant = 100;
+
+	// Open COM port
+	string stmp;
+	stmp = "\\\\.\\";
+	stmp.append(comName);
+	hComm = CreateFileA(stmp.c_str(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+	if (hComm != INVALID_HANDLE_VALUE)
+	{
+		// Set Events
+		if (!SetCommMask(hComm, 0))
+			errorCode = FAILURE;
+
+		// Set Timeouts
+		GetCommTimeouts(hComm, &m_ctmoOld);
+		if (!SetCommTimeouts(hComm, &m_ctmoNew))
+			errorCode = FAILURE;
+
+		// Set DCB
+		if (!SetCommState(hComm, &m_dcbCommPort))
+			errorCode = FAILURE;
+	}
+	else
+	{
+		errorCode = FAILURE;
+	};
+
+	// Check the results
+	if (errorCode != 0)
+	{
+		//unsigned long err = GetLastError();
+		CloseHandle(hComm);
+		hComm = INVALID_HANDLE_VALUE;
+		return errorCode;
+	}
+	else
+	{
+		PurgeComm(hComm, PURGE_TXCLEAR | PURGE_RXCLEAR);
+		return SUCCESS;
+	}
+#else
+    hComm = open(comName, O_RDWR | O_NOCTTY | O_SYNC);
+    if(hComm < 0)
+    {
+//        printf("%s",strerror(errno));
+//        MessageLog::getInstance()->write("Connection manager: failed opening COM port\n", LOG_ERROR);
+        return FAILURE;
+    }
+
+    struct termios tty;
+    memset(&tty, 0, sizeof(tty));
+    if( tcgetattr(hComm, &tty) != 0)
+    {
+//        MessageLog::getInstance()->write("Connection Manager: error from tcgetattr\n", LOG_ERROR);
+        return FAILURE;
+    }
+    int speed = B9600;
+    cfsetospeed(&tty, speed);
+    cfsetispeed(&tty, speed);
+
+    tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;
+    tty.c_iflag &= ~IGNBRK;
+    tty.c_lflag = 0;
+    tty.c_oflag = 0;
+    tty.c_cc[VMIN] = 0; // read non blocking
+    tty.c_cc[VTIME] = 5; // 0.5 seconds read timeout
+
+    tty.c_iflag &= ~(IXON | IXOFF | IXANY);
+    tty.c_cflag |= (CLOCAL | CREAD);
+
+    if(tcsetattr(hComm, TCSANOW, &tty) != 0)
+    {
+//        MessageLog::getInstance()->write("Connection manager: error from tcsetattr\n", LOG_ERROR);
+        return FAILURE;
+    }
+#endif
+    return SUCCESS;
+}
+
+/** @brief Checks if chip is connected to currently open port
+    @return chip is connected
+*/
+bool ConnectionCOM::TestConnectivity()
+{
+//currently set to always return true to show all com ports
+    return true;
+#ifndef __unix__
+	if (hComm != INVALID_HANDLE_VALUE)
+#else
+    if( hComm >= 0)
+#endif
+	{
+//	    unsigned char out[64];
+//	    unsigned char in[64];
+//	    memset(in, 0, 64);
+//	    out[0] = CMD_GET_INFO;
+//        SendData(out, 64);
+//        ReadData(in, 64);
+//        if(in[0] == CMD_GET_INFO && in[1] == 0x01)
+//            return true;
+//        else
+//            return false;
+	}
+	return false;
+}
+
+/** @brief Finds all chips connected to com ports
+    @return number of devices found
+*/
+int ConnectionCOM::RefreshDeviceList()
+{
+    int wasOpen = -1;
+    string wasOpenName = "";
+    if(IsOpen())
+    {
+        wasOpen = GetOpenedIndex();
+        wasOpenName = comPortName;
+    }
+    Close();
+    comPortList.clear();
+	if(comPortList.size() == 0)
+		FindAllComPorts();
+
+	m_deviceNames.clear();
+	string comName;
+	for(unsigned int i=0; i<comPortList.size(); i++)
+	{
+	    comName = comPortList[i];
+#ifndef __unix__
+		if( Open(comName.c_str(), comBaudrate) == SUCCESS)
+		{
+			if( TestConnectivity() ) //if responds add it to device list
+				m_deviceNames.push_back(comName);
+		}
+		Close();
+#else
+        m_deviceNames.push_back(comName);
+#endif
+	}
+	if(wasOpen != -1)
+    {
+        for(unsigned i=0; i<m_deviceNames.size(); ++i)
+            if(m_deviceNames[i] == wasOpenName)
+            {
+                Open(i);
+                break;
+            }
+    }
+	return m_deviceNames.size();
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionCOM::GetDeviceNames()
+{
+    return m_deviceNames;
+}
+
+/** @brief Purges communication buffers
+*/
+void ConnectionCOM::ClearComm()
+{
+#ifndef __unix__
+    PurgeComm(hComm, PURGE_TXCLEAR|PURGE_RXCLEAR);
+#endif
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.h
new file mode 100644
index 0000000000000000000000000000000000000000..0549472db1b9efb7312d75f906b3c7614e1455a7
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionCOM.h
@@ -0,0 +1,62 @@
+/**
+@file   ConnectionCOM.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data communications through COM port
+*/
+
+#ifndef CONNECTION_COM_PORT_H
+#define CONNECTION_COM_PORT_H
+
+#ifndef __unix__
+	#include "windows.h"
+#endif
+
+#include "IConnection.h"
+
+class ConnectionCOM : public IConnection
+{
+public:
+    static const int COM_BUFFER_LENGTH = 1024; //max buffer size for data
+
+	ConnectionCOM();
+	~ConnectionCOM();
+
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned i);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+	void ClearComm();
+private:
+	void FindAllComPorts();
+	DeviceStatus Open(const char *comName, int baudrate);
+
+	bool TestConnectivity();
+
+	std::string comPortName;
+	int comBaudrate;
+	bool connected;
+
+	int currentDeviceIndex;
+	std::vector<std::string> comPortList;
+	std::vector<std::string> m_deviceNames;
+
+#ifndef __unix__
+	HANDLE hComm;
+	COMMTIMEOUTS m_ctmoNew;
+	COMMTIMEOUTS m_ctmoOld;
+	OVERLAPPED m_osROverlap;
+	OVERLAPPED m_osWOverlap;
+	DCB m_dcbCommPort;
+#else
+    int hComm; //com port file descriptor
+#endif
+
+};
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9ec16e0d8845a9902ce9bffa4ea9b5e1309a91a4
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.cpp
@@ -0,0 +1,319 @@
+/**
+    @file ConnectionManager.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief Implementation of various connection types to devices
+*/
+
+#include "ConnectionManager.h"
+#include "ConnectionCOM.h"
+
+#ifdef ENABLE_USB_CONNECTION
+    #include "ConnectionUSB.h"
+#endif
+#ifdef ENABLE_SPI_CONNECTION
+    #include "ConnectionSPI.h"
+#endif
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+
+/** @brief Creates connection interfaces
+*/
+ConnectionManager::ConnectionManager(const IConnection::eConnectionType port_type) : activeControlPort(NULL)
+{
+    mLogData = false;
+    mOpenedDevice = -1;
+    if (port_type == IConnection::COM_PORT)
+        m_connections[IConnection::COM_PORT] = new ConnectionCOM();
+#ifdef ENABLE_USB_CONNECTION
+    if (port_type == IConnection::USB_PORT)
+        m_connections[IConnection::USB_PORT] = new ConnectionUSB();
+#endif
+#ifdef ENABLE_SPI_CONNECTION
+    m_connections[IConnection::SPI_PORT] = new ConnectionSPI();
+#endif
+}
+
+/** @brief Destroys connection interfaces
+*/
+ConnectionManager::~ConnectionManager()
+{
+	for (auto iter = m_connections.begin(); iter != m_connections.end(); ++iter)
+	{
+		delete iter->second;
+	}
+}
+
+/** @brief Checks if connection to device is opened
+    @return True if device is connected
+*/
+bool ConnectionManager::IsOpen()
+{
+    return activeControlPort ? activeControlPort->IsOpen() : false;
+}
+
+/** @brief Opens connection to first available device
+    @return True if connected to device
+*/
+bool ConnectionManager::Open()
+{
+    return Open(0);
+}
+
+/** @brief Connects to selected device
+    @param i device index from device list
+    @return 1:Success, 0:failure
+*/
+int ConnectionManager::Open(unsigned i)
+{
+    if(i >= mDevices.size())
+        return 0;
+
+    if(activeControlPort)
+        activeControlPort->Close();
+    switch(mDevices[i].port)
+    {
+    case IConnection::COM_PORT:
+        activeControlPort = m_connections[IConnection::COM_PORT];
+        break;
+    case IConnection::USB_PORT:
+		activeControlPort = m_connections[IConnection::USB_PORT];
+        break;
+    case IConnection::SPI_PORT:
+		activeControlPort = m_connections[IConnection::SPI_PORT];
+        break;
+    default:
+        return 0;
+    }
+    mOpenedDevice = -1;
+    if( i < mDevices.size() )
+    {
+        if (activeControlPort->Open(mDevices[i].portIndex) == IConnection::SUCCESS)
+        {
+            mOpenedDevice = i;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/** @brief Closes connection to device
+*/
+void ConnectionManager::Close()
+{
+    if(activeControlPort)
+    {
+        activeControlPort->Close();
+		//Notify(LMS_Message(MSG_BOARD_DISCONNECTED, "", 0, 0));
+    }
+    mOpenedDevice = -1;
+}
+
+/** @brief Finds all currently connected devices and forms device list
+    @return number of devices found
+*/
+int ConnectionManager::RefreshDeviceList()
+{
+    mDeviceList.clear();
+    mDevices.clear();
+    DeviceInfo dev;
+    for (auto iter = m_connections.begin(); iter != m_connections.end(); ++iter)
+    {
+        vector<string> names;
+        IConnection *port = iter->second;
+        if(port->RefreshDeviceList() > 0)
+        {
+            names = port->GetDeviceNames();
+            for(unsigned i=0; i<names.size(); ++i)
+            {
+                dev.name = names[i];
+                dev.port = iter->first;
+                dev.portIndex = i;
+                mDevices.push_back(dev);
+            }
+        }
+    }
+    for(unsigned i=0; i<mDevices.size(); ++i)
+        mDeviceList.push_back(mDevices[i].name);
+    return mDevices.size();
+}
+
+/** @brief Returns currently opened connection index
+*/
+int ConnectionManager::GetOpenedIndex()
+{
+    return mOpenedDevice;
+}
+
+/** @brief Writes given data to currently opened connection
+    @param buffer outcomming data buffer
+    @param length bytes to write
+    @param timeout_ms timeout in milliseconds
+    @return number of bytes written, on failure negative values
+*/
+int ConnectionManager::Write(const unsigned char *buffer, const int length, int timeout_ms)
+{
+    if(activeControlPort)
+    {
+        int bytesTransferred = activeControlPort->Write(buffer, length, timeout_ms);
+#ifndef NDEBUG
+        if(mLogData)
+        {
+            stringstream ss;
+            ss << "WR(" <<  (bytesTransferred>=0?bytesTransferred: 0) << "): ";
+            ss << std::hex << std::setfill('0');
+            int repeatedZeros = 0;
+            for(int i=length-1; i>=0; --i)
+                if(buffer[i] == 0)
+                    ++repeatedZeros;
+                else break;
+            if(repeatedZeros == 1)
+                repeatedZeros = 0;
+            repeatedZeros = repeatedZeros - (repeatedZeros & 0x1);
+            for(int i=0; i<length-repeatedZeros; ++i)
+                //casting to short to print as numbers
+                ss << " " << std::setw(2) << (unsigned short)buffer[i];
+            if(repeatedZeros > 1)
+                ss << " (00 x " << std::dec << repeatedZeros << " times)";
+            cout << ss.str() << endl;
+#ifndef __unix__
+            OutputDebugString(ss.str().c_str());
+#endif
+        }
+#endif
+        return bytesTransferred;
+    }
+    return -1;
+}
+
+/** @brief Receives data from currently opened connection
+    @param buffer incomming data buffer, must be big enough for length bytes
+    @param length bytes to read
+    @param timeout_ms timeout in milliseconds
+    @return number of bytes received
+*/
+int ConnectionManager::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+    if(activeControlPort)
+    {
+        int bytesTransferred = activeControlPort->Read(buffer, length, timeout_ms);
+#ifndef NDEBUG
+        if(mLogData)
+        {
+            stringstream ss;
+            ss << "RD(" <<  (bytesTransferred>=0?bytesTransferred: 0) << "): ";
+            ss << std::hex << std::setfill('0');
+            int repeatedZeros = 0;
+            for(int i=length-1; i>=0; --i)
+                if(buffer[i] == 0)
+                    ++repeatedZeros;
+                else break;
+            if(repeatedZeros == 2)
+                repeatedZeros = 0;
+            repeatedZeros = repeatedZeros - (repeatedZeros & 0x1);
+            for(int i=0; i<length-repeatedZeros; ++i)
+                //casting to short to print as numbers
+                ss << " " << std::setw(2) << (unsigned short)buffer[i];
+            if(repeatedZeros > 2)
+                ss << " (00 x " << std::dec << repeatedZeros << " times)";
+            cout << ss.str() << endl;
+        }
+#endif
+        return bytesTransferred;
+    }
+    return -1;
+}
+
+int ConnectionManager::WriteStream(const char *buffer, int length)
+{
+	return 0;
+}
+
+int ConnectionManager::ReadStream(char *buffer, int length, unsigned int timeout_ms)
+{
+	/*int handle = activeControlPort->BeginDataReading(buffer, length);
+    activeControlPort->WaitForReading(handle, timeout_ms);
+	long received = length;
+	activeControlPort->FinishDataReading(buffer, received, handle);
+	return received;
+    */
+    long len = length;
+    int status = activeControlPort->ReadDataBlocking(buffer, len, 0);
+    return len;
+}
+
+
+int ConnectionManager::BeginDataReading(char *buffer, long length)
+{
+    return activeControlPort->BeginDataReading(buffer, length);
+}
+/**
+@brief Blocks until data is received or set number of milliseconds have passed.
+@param contextHandle handle returned by BeginDataReading()
+@param timeout_ms number of milliseconds to wait
+@return 1-data received, 0-data not received
+*/
+int ConnectionManager::WaitForReading(int contextHandle, unsigned int timeout_ms)
+{
+    return activeControlPort->WaitForReading(contextHandle, timeout_ms);
+}
+/**
+@brief Finished asynchronous data reading.
+@param buffer where to put received data
+@param length number of bytes to read, will be changed to actual number of bytes received
+@param contextHandle context handle returned by BeginDataReading()
+@return received data length
+*/
+int ConnectionManager::FinishDataReading(char *buffer, long &length, int contextHandle)
+{
+    return activeControlPort->FinishDataReading(buffer, length, contextHandle);
+}
+
+/**
+@brief Aborts reading operations
+*/
+void ConnectionManager::AbortReading()
+{
+    activeControlPort->AbortReading();
+}
+
+/**
+@brief Start asynchronous data sending.
+@param buffer data buffer to be sent
+@param length number of bytes to send.
+@return context handle
+*/
+int ConnectionManager::BeginDataSending(const char *buffer, long length)
+{
+    return activeControlPort->BeginDataSending(buffer, length);
+}
+/**
+@brief Blocks until data is sent or set number of miliseconds have passed.
+@param contextHandle handle returned by BeginDataReading()
+@param timeout_ms number of miliseconds to wait
+@return 1-data sent, 0-data not sent
+*/
+int ConnectionManager::WaitForSending(int contextHandle, unsigned int timeout_ms)
+{
+    return activeControlPort->WaitForSending(contextHandle, timeout_ms);
+}
+/**
+@brief Finished asynchronous data sending.
+@param buffer where to put received data
+@param length number of bytes to send, will be changed to actual number of bytes sent
+@param contextHandle context handle returned by BeginDataReading()
+@return sent data length
+*/
+int ConnectionManager::FinishDataSending(const char *buffer, long &length, int contextHandle)
+{
+    return activeControlPort->FinishDataSending(buffer, length, contextHandle);
+}
+
+/**
+@brief Aborts sending operations
+*/
+void ConnectionManager::AbortSending()
+{
+    activeControlPort->AbortSending();
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.h
new file mode 100644
index 0000000000000000000000000000000000000000..68819011ffaca85af49acc67956937144f8dab36
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionManager.h
@@ -0,0 +1,60 @@
+/**
+    @file ConnectionManager.h
+    @author Lime Microsystems (www.limemicro.com)
+    @brief Class for managing connection to devices
+*/
+
+#ifndef LMS_CONNECTION_MANAGER_H
+#define LMS_CONNECTION_MANAGER_H
+
+#include "IConnection.h"
+#include <map>
+
+class ConnectionManager
+{
+public:
+    struct DeviceInfo
+    {
+        std::string name;
+        IConnection::eConnectionType port;
+        int portIndex;
+    };
+
+    ConnectionManager(const IConnection::eConnectionType port_type);
+    ~ConnectionManager();
+    bool IsOpen();
+    bool Open();
+    int Open(unsigned i);
+    void Close();
+    int RefreshDeviceList();
+    int GetOpenedIndex();
+    std::vector<std::string> GetDeviceList(){return mDeviceList;};
+
+    int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	int WriteStream(const char *buffer, int length);
+	int ReadStream(char *buffer, int length, unsigned int timeout_ms);
+
+    int BeginDataReading(char *buffer, long length);
+    int WaitForReading(int contextHandle, unsigned int timeout_ms);
+    int FinishDataReading(char *buffer, long &length, int contextHandle);
+    void AbortReading();
+
+    int BeginDataSending(const char *buffer, long length);
+    int WaitForSending(int contextHandle, unsigned int timeout_ms);
+    int FinishDataSending(const char *buffer, long &length, int contextHandle);
+    void AbortSending();
+
+protected:
+    bool mLogData;
+    /// Port used for communication.
+	IConnection *activeControlPort;
+    std::vector<DeviceInfo> mDevices;
+    std::vector<std::string> mDeviceList;
+    int mOpenedDevice;
+    std::map<IConnection::eConnectionType, IConnection*> m_connections;
+};
+
+#endif // LMS_CONNECTION_MANAGER_H
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fb305f9c1ccfe627c70006f96d84dbc758310056
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.cpp
@@ -0,0 +1,313 @@
+/**
+    @file   ConnectionSPI.cpp
+    @author Lime Microsystems (www.limemicro.com)
+    @brief  Implementation of communications through SPI port
+*/
+
+#include "ConnectionSPI.h"
+
+#include "string.h"
+#ifdef __unix__
+#include <fstream>
+#include <errno.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/spi/spidev.h>
+#include <linux/i2c-dev.h>
+#endif // LINUX
+
+#include <iostream>
+#include <sstream>
+
+const int ConnectionSPI::cSPI_BUF_SIZE = 128;
+const int ConnectionSPI::cSPI_SPEED_HZ = 2000000;
+
+/** @brief Tries to read EEPROM for Novena board signature
+    @return true if Novena board
+*/
+bool IsNovenaBoard()
+{
+#ifdef __unix__
+    char data[8];
+    int count = 6;
+    memset(data, 0, 8);
+    int addr = 0;
+    struct i2c_rdwr_ioctl_data session;
+    struct i2c_msg messages[2];
+    char set_addr_buf[2];
+    memset(set_addr_buf, 0, sizeof(set_addr_buf));
+    memset(data, 0, count);
+    set_addr_buf[0] = addr>>8;
+    set_addr_buf[1] = addr;
+    messages[0].addr = 0xac>>1;
+    messages[0].flags = 0;
+    messages[0].len = sizeof(set_addr_buf);
+    messages[0].buf = set_addr_buf;
+    messages[1].addr = 0xac>>1;
+    messages[1].flags = I2C_M_RD;
+    messages[1].len = count;
+    messages[1].buf = data;
+    session.msgs = messages;
+    session.nmsgs = 2;
+
+    bool isNovena = false;
+
+    int fd = open("/dev/i2c-2", O_RDWR);
+    if(fd > 0)
+    {
+        if(ioctl(fd, I2C_RDWR, &session) < 0)
+        {
+            perror("Unable to communicate with i2c device");
+            isNovena = false;
+        }
+        if(strcmp("Novena", data) == 0)
+            isNovena = true;
+    }
+    close(fd);
+    return isNovena;
+#else
+    return false;
+#endif
+}
+
+/** @brief Initializes SPI port and exports needed GPIO
+*/
+ConnectionSPI::ConnectionSPI()
+{
+    fd = -1;
+    m_connectionType = SPI_PORT;
+    std::fstream gpio;
+    //export SEN pin
+    gpio.open("/sys/class/gpio/export", ios::out);
+    if(gpio.good())
+    {
+        gpio << 122;
+        gpio.flush();
+        gpio.close();
+        gpio.open("/sys/class/gpio/gpio122/direction", ios::out);
+        gpio << "out";
+        gpio.flush();
+        gpio.close();
+        m_SEN.open("/sys/class/gpio/gpio122/value", ios::out);
+        m_SEN<< 1;
+        m_SEN.flush();
+        cout << "GPIO122: set to 1" << endl;
+    }
+}
+
+ConnectionSPI::~ConnectionSPI()
+{
+    Close();
+    m_SEN.close();
+}
+
+/** @brief Opens connection to first found chip
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionSPI::Open()
+{
+	Close();
+#ifdef __unix__
+	fd = open("/dev/spidev2.0", O_RDWR | O_SYNC);
+	if (fd < 0)
+	{
+        //MessageLog::getInstance()->write("SPI PORT: device not found\n", LOG_ERROR);
+		return IConnection::FAILURE;
+	}
+	int mode = SPI_MODE_0;
+	int ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);
+	if (ret == -1)
+		printf("can't set spi mode");
+
+	ret = ioctl(fd, SPI_IOC_RD_MODE, &mode);
+	if (ret == -1)
+		printf("can't get spi mode");
+
+	/*
+	 * bits per word
+	 */
+    int bits = 8;
+	ret = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
+	if (ret == -1)
+		printf("can't set bits per word");
+
+	ret = ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &bits);
+	if (ret == -1)
+		printf("can't get bits per word");
+
+	/*
+	 * max speed hz
+	 */
+	int speed = cSPI_SPEED_HZ;
+	ret = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+	if (ret == -1)
+		printf("can't set max speed hz");
+
+	ret = ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed);
+	if (ret == -1)
+		printf("can't get max speed hz");
+
+	printf("spi mode: 0x%x\n", mode);
+	printf("bits per word: %d\n", bits);
+	printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
+    return IConnection::SUCCESS;
+#else
+    return IConnection::FAILURE;
+#endif
+}
+
+/** @brief Opens connection to selected chip
+    @param index chip index in device list
+    @return 0-success
+*/
+IConnection::DeviceStatus ConnectionSPI::Open(unsigned index)
+{
+    return Open();
+}
+
+/** @brief Closes connection to chip
+*/
+void ConnectionSPI::Close()
+{
+#ifdef __unix__
+    close(fd);
+    fd = -1;
+#endif
+}
+
+/** @brief Returns whether chip is connected
+    @return chip is connected
+*/
+bool ConnectionSPI::IsOpen()
+{
+    return (fd >= 0);
+}
+
+/** @brief Sends data through COM port
+    @param buffer data buffer to send
+    @param length size of data buffer
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes sent
+*/
+int ConnectionSPI::Write(const unsigned char *buffer, int length, int timeout_ms)
+{
+    #ifdef __unix__
+    if(fd < 0)
+        return 0;
+    m_SEN << 0;
+    m_SEN.flush();
+    unsigned long bytesWritten = 0;
+    rxbuf.clear();
+    int bytesReceived = 0;
+    char rxbytes[2];
+    while(bytesWritten < length)
+    {
+        int toWrite = length-bytesWritten > cSPI_BUF_SIZE ? cSPI_BUF_SIZE : length-bytesWritten;
+        for(int i=0; i<toWrite; i+=2)
+        {
+            if(buffer[i] < 0x80) //reading
+            {
+                write(fd, &buffer[i+bytesWritten], 2);
+                bytesReceived += read(fd, rxbytes, 2);
+                rxbuf.push_back(rxbytes[0]);
+                rxbuf.push_back(rxbytes[1]);
+            }
+            else //writing
+            {
+                write(fd, &buffer[i+bytesWritten], 4);
+                i+=2; //data bytes have been written
+            }
+        }
+//        stringstream ss;
+//        ss << "write(" << toWrite << "): ";
+//        for(int i=0; i<toWrite; ++i)
+//        {
+//            char ctemp[16];
+//            sprintf(ctemp, "%02X", buffer[bytesWritten+i]);
+//            ss << ctemp << " ";
+//        }
+//        ss << endl;
+//        if(bytesReceived > 0)
+//        {
+//            ss << " re443ad(" << toWrite << "): ";
+//            for(int i=0; i<toWrite; ++i)
+//            {
+//                char ctemp[16];
+//                sprintf(ctemp, "%02X", rxbuf[bytesWritten+i]);
+//                ss << ctemp << " ";
+//            }
+//            ss << endl;
+//        }
+//        cout << ss.str() << endl;
+//        MessageLog::getInstance()->write(ss.str(), LOG_DATA);
+
+        bytesWritten += toWrite;
+    }
+    m_SEN << 1;
+    m_SEN.flush();
+    return bytesWritten;
+#else
+    return 0;
+#endif
+}
+
+/** @brief Reads data from COM port
+    @param buffer pointer to data buffer for receiving
+    @param length number of bytes to read
+    @param timeout_ms timeout limit for operation in milliseconds
+    @return Number of bytes received
+*/
+int ConnectionSPI::Read(unsigned char *buffer, int length, int timeout_ms)
+{
+#ifdef __unix__
+    if(fd < 0)
+        return 0;
+    //because transfer is done in full duplex, function returns data from last transfer
+    int tocpy = length > rxbuf.size() ? rxbuf.size() : length;
+    memcpy(buffer, &rxbuf[0], tocpy);
+    rxbuf.clear();
+    return tocpy;
+#else
+    return 0;
+#endif
+}
+
+/** @brief Finds all chips connected to com ports
+    @return number of devices found
+*/
+int ConnectionSPI::RefreshDeviceList()
+{
+    m_deviceNames.clear();
+#ifdef __unix__
+    int spidev = open("/dev/spidev2.0", O_RDWR);
+	if (spidev >= 0)
+	{
+	    if(IsNovenaBoard() == true)
+            m_deviceNames.push_back("SPI (Novena)");
+        else
+            m_deviceNames.push_back("SPI");
+	}
+    close(spidev);
+#endif
+    return m_deviceNames.size();
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionSPI::GetDeviceNames()
+{
+    return m_deviceNames;
+}
+
+int ConnectionSPI::GetOpenedIndex()
+{
+    return 0;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..79d9bd9b9b690c470f156acfb1ebdd2a11e0b4ae
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionSPI.h
@@ -0,0 +1,41 @@
+/**
+@file   ConnectionSPI.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data communications through SPI port
+*/
+
+#ifndef CONNECTION_SPI_PORT_H
+#define CONNECTION_SPI_PORT_H
+
+#include "IConnection.h"
+#include <fstream>
+#include <string>
+#include <vector>
+
+class ConnectionSPI : public IConnection
+{
+public:
+    static const int cSPI_BUF_SIZE;
+    static const int cSPI_SPEED_HZ;
+
+	ConnectionSPI();
+	~ConnectionSPI();
+
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned i);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+protected:
+    std::vector<std::string> m_deviceNames;
+	std::vector<unsigned char> rxbuf;
+    int fd;
+    std::fstream m_SEN;
+};
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..148b7b776bc776c8ac5f7fbd2bb1bc923a98dbb4
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.cpp
@@ -0,0 +1,771 @@
+/**
+@file   ConnectionUSB.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief  Data writing and reading through USB port
+*/
+
+#include "ConnectionUSB.h"
+#include <string.h>
+
+#ifdef __unix__
+    #include <thread>
+    #include <chrono>
+#endif
+
+#define USB_TIMEOUT 1000
+
+#define HW_LDIGIRED L"DigiRed"
+#define HW_LDIGIGREEN L"DigiGreen"
+#define HW_LSTREAMER L"Stream"
+
+#define HW_DIGIRED "DigiRed"
+#define HW_DIGIGREEN "DigiGreen"
+#define HW_STREAMER "Stream"
+
+#define CTR_W_REQCODE 0xC1
+#define CTR_W_VALUE 0x0000
+#define CTR_W_INDEX 0x0000
+
+#define CTR_R_REQCODE 0xC0
+#define CTR_R_VALUE 0x0000
+#define CTR_R_INDEX 0x0000
+
+/**	@brief Initializes port type and object necessary to communicate to usb device.
+*/
+ConnectionUSB::ConnectionUSB()
+{
+    m_hardwareName = "";
+    isConnected = false;
+    m_connectionType = USB_PORT;
+#ifndef __unix__
+    USBDevicePrimary = new CCyUSBDevice(NULL);
+    OutCtrEndPt = NULL;
+    InCtrEndPt = NULL;
+	InCtrlEndPt3 = NULL;
+	OutCtrlEndPt3 = NULL;
+#else
+    dev_handle = 0;
+    devs = 0;
+    int r = libusb_init(&ctx); //initialize the library for the session we just declared
+    if(r < 0)
+        printf("Init Error %i\n", r); //there was an error
+    libusb_set_debug(ctx, 3); //set verbosity level to 3, as suggested in the documentation
+#endif
+    currentDeviceIndex = -1;
+}
+
+/**	@brief Closes connection to chip and deallocates used memory.
+*/
+ConnectionUSB::~ConnectionUSB()
+{
+    Close();
+#ifndef __unix__
+    delete USBDevicePrimary;
+#else
+    libusb_exit(ctx);
+#endif
+}
+
+/**	@brief Automatically open first available chip connected to usb port.
+	@return 0-success, other-failure
+*/
+IConnection::DeviceStatus ConnectionUSB::Open()
+{
+    currentDeviceIndex = -1;
+    if(m_deviceNames.size() == 0)
+        RefreshDeviceList();
+
+#ifndef __unix__
+    for(int i=0; i<USBDevicePrimary->DeviceCount(); ++i)
+        if( Open(i) == SUCCESS)
+        {
+            currentDeviceIndex = i;
+            return SUCCESS;
+        }
+#else
+    if(Open(0) == SUCCESS)
+        return SUCCESS;
+#endif
+    return FAILURE;
+}
+
+/**	@brief Tries to open connected USB device and find communication endpoints.
+	@return Returns 1-Success, 0-EndPoints not found or device didn't connect.
+*/
+IConnection::DeviceStatus ConnectionUSB::Open(unsigned index)
+{
+#ifndef __unix__
+	wstring m_hardwareDesc = L"";
+	if( index < USBDevicePrimary->DeviceCount())
+	{
+		if(USBDevicePrimary->Open(index))
+		{
+            m_hardwareDesc = USBDevicePrimary->Product;
+            unsigned int pos;
+            //determine connected board type
+            pos = m_hardwareDesc.find(HW_LDIGIRED, 0);
+            if( pos != wstring::npos )
+                m_hardwareName = HW_DIGIRED;
+            else if (m_hardwareDesc.find(HW_LSTREAMER, 0) != wstring::npos)
+                m_hardwareName = HW_STREAMER;
+            else
+				m_hardwareName = HW_STREAMER;
+
+
+			if (InCtrlEndPt3)
+			{
+				delete InCtrlEndPt3;
+				InCtrlEndPt3 = NULL;
+			}
+			InCtrlEndPt3 = new CCyControlEndPoint(*USBDevicePrimary->ControlEndPt);
+
+			if (OutCtrlEndPt3)
+			{
+				delete OutCtrlEndPt3;
+				OutCtrlEndPt3 = NULL;
+			}
+			OutCtrlEndPt3 = new CCyControlEndPoint(*USBDevicePrimary->ControlEndPt);
+
+			InCtrlEndPt3->ReqCode = CTR_R_REQCODE;
+			InCtrlEndPt3->Value = CTR_R_VALUE;
+			InCtrlEndPt3->Index = CTR_R_INDEX;
+
+			OutCtrlEndPt3->ReqCode = CTR_W_REQCODE;
+			OutCtrlEndPt3->Value = CTR_W_VALUE;
+			OutCtrlEndPt3->Index = CTR_W_INDEX;
+
+			for (int i=0; i<USBDevicePrimary->EndPointCount(); i++)
+				if(USBDevicePrimary->EndPoints[i]->Address == 0x01)
+				{
+					OutEndPt = USBDevicePrimary->EndPoints[i];
+					long len = OutEndPt->MaxPktSize * 64;
+					OutEndPt->SetXferSize(len);
+					break;
+				}
+			for (int i=0; i<USBDevicePrimary->EndPointCount(); i++)
+				if(USBDevicePrimary->EndPoints[i]->Address == 0x81)
+				{
+					InEndPt = USBDevicePrimary->EndPoints[i];
+					long len = InEndPt->MaxPktSize * 64;
+					InEndPt->SetXferSize(len);
+					break;
+				}
+			isConnected = true;
+			return SUCCESS;
+		} //successfully opened device
+	} //if has devices
+    return FAILURE;
+#else
+    if(index >= 0 && index < m_dev_pid_vid.size())
+    {
+		dev_handle = libusb_open_device_with_vid_pid(ctx, m_dev_pid_vid[index].second, m_dev_pid_vid[index].first);
+
+		if(dev_handle == 0)
+            return FAILURE;
+        if(libusb_kernel_driver_active(dev_handle, 0) == 1)   //find out if kernel driver is attached
+        {
+            printf("Kernel Driver Active\n");
+            if(libusb_detach_kernel_driver(dev_handle, 0) == 0) //detach it
+                printf("Kernel Driver Detached!\n");
+        }
+        int r = libusb_claim_interface(dev_handle, 0); //claim interface 0 (the first) of device
+        if(r < 0)
+        {
+            printf("Cannot Claim Interface\n");
+            return CANNOT_CLAIM_INTERFACE;
+        }
+        printf("Claimed Interface\n");
+        isConnected = true;
+        return SUCCESS;
+    }
+    else
+    {
+        return FAILURE;
+    }
+#endif
+}
+
+/**	@brief Closes communication to device.
+*/
+void ConnectionUSB::Close()
+{
+    #ifndef __unix__
+	USBDevicePrimary->Close();
+	InEndPt = NULL;
+	OutEndPt = NULL;
+	if (InCtrlEndPt3)
+	{
+		delete InCtrlEndPt3;
+		InCtrlEndPt3 = NULL;
+	}
+	if (OutCtrlEndPt3)
+	{
+		delete OutCtrlEndPt3;
+		OutCtrlEndPt3 = NULL;
+	}
+    #else
+    if(dev_handle != 0)
+    {
+        libusb_release_interface(dev_handle, 0);
+        libusb_close(dev_handle);
+        dev_handle = 0;
+    }
+    #endif
+    isConnected = false;
+}
+
+/**	@brief Returns connection status
+	@return 1-connection open, 0-connection closed.
+*/
+bool ConnectionUSB::IsOpen()
+{
+    #ifndef __unix__
+    return USBDevicePrimary->IsOpen() && isConnected;
+    #else
+    return isConnected;
+    #endif
+}
+
+/**	@brief Sends given data buffer to chip through USB port.
+	@param buffer data buffer, must not be longer than 64 bytes.
+	@param length given buffer size.
+    @param timeout_ms timeout limit for operation in milliseconds
+	@return number of bytes sent.
+*/
+int ConnectionUSB::Write(const unsigned char *buffer, const int length, int timeout_ms)
+{
+    long len = length;
+    if(IsOpen())
+    {
+		unsigned char* wbuffer = new unsigned char[length];
+		memcpy(wbuffer, buffer, length);
+        if(m_hardwareName == HW_DIGIRED || m_hardwareName == HW_STREAMER)
+        {
+            #ifndef __unix__
+            if(OutCtrlEndPt3)
+                OutCtrlEndPt3->Write(wbuffer, len);
+            else
+                len = 0;
+            #else
+                len = libusb_control_transfer(dev_handle, LIBUSB_REQUEST_TYPE_VENDOR,CTR_W_REQCODE ,CTR_W_VALUE, CTR_W_INDEX, wbuffer, length, USB_TIMEOUT);
+            #endif
+        }
+        else
+        {
+            #ifndef __unix__
+            if(OutCtrEndPt)
+                OutCtrEndPt->XferData(wbuffer, len);
+            else
+                len = 0;
+            #else
+                int actual = 0;
+                libusb_bulk_transfer(dev_handle, 0x01, wbuffer, len, &actual, USB_TIMEOUT);
+                len = actual;
+            #endif
+        }
+		delete wbuffer;
+    }
+    else
+        return 0;
+    return len;
+}
+
+/**	@brief Reads data coming from the chip through USB port.
+	@param buffer pointer to array where received data will be copied, array must be
+	big enough to fit received data.
+	@param length number of bytes to read from chip.
+    @param timeout_ms timeout limit for operation in milliseconds
+	@return number of bytes received.
+*/
+int ConnectionUSB::Read(unsigned char *buffer, const int length, int timeout_ms)
+{
+    long len = length;
+    if(IsOpen())
+    {
+        if(m_hardwareName == HW_DIGIRED || m_hardwareName == HW_STREAMER)
+        {
+            #ifndef __unix__
+            if(InCtrlEndPt3)
+                InCtrlEndPt3->Read(buffer, len);
+            else
+                len = 0;
+            #else
+            len = libusb_control_transfer(dev_handle, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN ,CTR_R_REQCODE ,CTR_R_VALUE, CTR_R_INDEX, buffer, len, USB_TIMEOUT);
+            #endif
+        }
+        else
+        {
+            #ifndef __unix__
+            if(InCtrEndPt)
+                InCtrEndPt->XferData(buffer, len);
+            else
+                len = 0;
+            #else
+                int actual = 0;
+                libusb_bulk_transfer(dev_handle, 0x81, buffer, len, &actual, USB_TIMEOUT);
+                len = actual;
+            #endif
+        }
+    }
+    return len;
+}
+
+#ifdef __unix__
+/**	@brief Function for handling libusb callbacks
+*/
+void callback_libusbtransfer(libusb_transfer *trans)
+{
+	USBTransferContext *context = reinterpret_cast<USBTransferContext*>(trans->user_data);
+	switch(trans->status)
+	{
+    case LIBUSB_TRANSFER_CANCELLED:
+        printf("Transfer canceled\n" );
+        context->bytesXfered = trans->actual_length;
+        context->done = true;
+        context->used = false;
+        context->reset();
+        break;
+    case LIBUSB_TRANSFER_COMPLETED:
+        if(trans->actual_length == context->bytesExpected)
+		{
+			context->bytesXfered = trans->actual_length;
+			context->done = true;
+		}
+		//printf("Transfer complete %i\n", trans->actual_length);
+        break;
+    case LIBUSB_TRANSFER_ERROR:
+        printf("TRANSFER ERRRO\n");
+        break;
+    case LIBUSB_TRANSFER_TIMED_OUT:
+        printf("transfer timed out\n");
+
+        break;
+    case LIBUSB_TRANSFER_OVERFLOW:
+        printf("transfer overflow\n");
+
+        break;
+    case LIBUSB_TRANSFER_STALL:
+        printf("transfer stalled\n");
+        break;
+	}
+    context->mPacketProcessed.notify_one();
+}
+#endif
+
+/** @brief Finds all chips connected to usb ports
+    @return number of devices found
+*/
+int ConnectionUSB::RefreshDeviceList()
+{
+    #ifndef __unix__
+    USBDevicePrimary->Close();
+    currentDeviceIndex = -1;
+    m_deviceNames.clear();
+    string name;
+    if (USBDevicePrimary->DeviceCount())
+    {
+        for (int i=0; i<USBDevicePrimary->DeviceCount(); ++i)
+        {
+            Open(i);
+            name = DeviceName();
+            m_deviceNames.push_back(name);
+        }
+        currentDeviceIndex = -1;
+    }
+    #else
+    m_dev_pid_vid.clear();
+    m_deviceNames.clear();
+    int usbDeviceCount = libusb_get_device_list(ctx, &devs);
+    if(usbDeviceCount > 0)
+    {
+        libusb_device_descriptor desc;
+        for(int i=0; i<usbDeviceCount; ++i)
+        {
+            int r = libusb_get_device_descriptor(devs[i], &desc);
+            if(r<0)
+                printf("failed to get device description\n");
+            int pid = desc.idProduct;
+            int vid = desc.idVendor;
+
+            if( vid == 1204)
+            {
+                if(pid == 34323)
+                {
+                    m_hardwareName = HW_DIGIGREEN;
+                    m_deviceNames.push_back("DigiGreen");
+                    m_dev_pid_vid.push_back( pair<int,int>(pid,vid));
+                }
+                else if(pid == 241)
+                {
+                    m_hardwareName = HW_DIGIRED;
+                    libusb_device_handle *tempDev_handle;
+                    tempDev_handle = libusb_open_device_with_vid_pid(ctx, vid, pid);
+                    if(libusb_kernel_driver_active(tempDev_handle, 0) == 1)   //find out if kernel driver is attached
+                    {
+                        if(libusb_detach_kernel_driver(tempDev_handle, 0) == 0) //detach it
+                            printf("Kernel Driver Detached!\n");
+                    }
+                    if(libusb_claim_interface(tempDev_handle, 0) < 0) //claim interface 0 (the first) of device
+                    {
+                        printf("Cannot Claim Interface\n");
+                    }
+
+                    string fullName;
+                    //check operating speed
+                    int speed = libusb_get_device_speed(devs[i]);
+                    if(speed == LIBUSB_SPEED_HIGH)
+                        fullName = "USB 2.0";
+                    else if(speed == LIBUSB_SPEED_SUPER)
+                        fullName = "USB 3.0";
+                    else
+                        fullName = "USB";
+                    fullName += " (";
+                    //read device name
+                    char data[255];
+                    memset(data, 0, 255);
+                    int st = libusb_get_string_descriptor_ascii(tempDev_handle, 2, (unsigned char*)data, 255);
+                    if(strlen(data) > 0)
+                        fullName += data;
+                    fullName += ")";
+                    libusb_close(tempDev_handle);
+
+                    m_deviceNames.push_back(fullName);
+                    m_dev_pid_vid.push_back( pair<int,int>(pid,vid));
+                }
+            }
+        }
+    }
+    else
+    {
+        libusb_free_device_list(devs, 1);
+        return 0;
+    }
+    #endif
+    return m_deviceNames.size();
+}
+
+void ConnectionUSB::ClearComm()
+{
+}
+
+/**	@return name of currently opened device as string.
+*/
+string ConnectionUSB::DeviceName()
+{
+#ifndef __unix__
+	string name;
+	char tempName[USB_STRING_MAXLEN];
+	//memcpy(tempName, USBDevicePrimary->FriendlyName, USB_STRING_MAXLEN);
+    //name = tempName;
+
+	for (int i = 0; i < USB_STRING_MAXLEN; ++i)
+		tempName[i] = USBDevicePrimary->DeviceName[i];
+    if (USBDevicePrimary->bSuperSpeed == true)
+        name = "USB 3.0";
+    else if (USBDevicePrimary->bHighSpeed == true)
+        name = "USB 2.0";
+    else
+        name = "USB";
+    name += " (";
+	name += tempName;
+	name += ")";
+    return name;
+#else
+    if(dev_handle != 0)
+    {
+        char data[255];
+        int st = libusb_get_string_descriptor_ascii(dev_handle, 2, (unsigned char*)data, 255);
+        return string(data);
+    }
+    return "no name";
+#endif
+}
+
+/**
+	@brief Starts asynchronous data reading from board
+	@param *buffer buffer where to store received data
+	@param length number of bytes to read
+	@return handle of transfer context
+*/
+int ConnectionUSB::BeginDataReading(char *buffer, long length)
+{
+    int i = 0;
+	bool contextFound = false;
+	//find not used context
+    for(i = 0; i<USB_MAX_CONTEXTS; i++)
+    {
+        if(!contexts[i].used)
+        {
+            contextFound = true;
+            break;
+        }
+    }
+    if(!contextFound)
+        return -1;
+    contexts[i].used = true;
+    #ifndef __unix__
+    if(InEndPt)
+        contexts[i].context = InEndPt->BeginDataXfer((unsigned char*)buffer, length, contexts[i].inOvLap);
+	return i;
+    #else
+    unsigned int Timeout = 1000;
+    libusb_transfer *tr = contexts[i].transfer;
+	libusb_fill_bulk_transfer(tr, dev_handle, 0x81, (unsigned char*)buffer, length, callback_libusbtransfer, &contexts[i], Timeout);
+	contexts[i].done = false;
+	contexts[i].bytesXfered = 0;
+	contexts[i].bytesExpected = length;
+    int status = libusb_submit_transfer(tr);
+    int actual = 0;
+    //int status = libusb_bulk_transfer(dev_handle, 0x81, (unsigned char*)buffer, length, &actual, USB_TIMEOUT);
+    if(status != 0)
+        printf("ERROR BEGIN DATA TRANSFER %s\n", libusb_error_name(status));
+    #endif
+    return i;
+}
+
+/**
+	@brief Waits for asynchronous data reception
+	@param contextHandle handle of which context data to wait
+	@param timeout_ms number of miliseconds to wait
+	@return 1-data received, 0-data not received
+*/
+int ConnectionUSB::WaitForReading(int contextHandle, unsigned int timeout_ms)
+{
+    if( contexts[contextHandle].used == true && contextHandle >= 0)
+    {
+    int status = 0;
+    #ifndef __unix__
+	if(InEndPt)
+        status = InEndPt->WaitForXfer(contexts[contextHandle].inOvLap, timeout_ms);
+	return status;
+    #else
+
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;  
+    if(libusb_handle_events_timeout_completed(ctx, &tv, NULL) != 0)
+    printf("error libusb_handle_events %i\n", status);
+            
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+    
+    while(contexts[contextHandle].done == false && std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count() < timeout_ms)
+	{
+	    struct timeval tv;
+	    tv.tv_sec = 0;
+	    tv.tv_usec = 300;
+            std::this_thread::yield();
+		//if(libusb_handle_events(ctx) != 0)
+            if(libusb_handle_events_timeout_completed(ctx, &tv, NULL) != 0)
+            printf("error libusb_handle_events %i\n", status);
+            t2 = chrono::high_resolution_clock::now();        
+            //std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+    std::unique_lock<std::mutex> lck(contexts[contextHandle].m_lock);
+    while(contexts[contextHandle].done == false) //is changed in libusb callback
+    {
+        if(contexts[contextHandle].mPacketProcessed.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+            return 0;
+    }
+	return contexts[contextHandle].done == true;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Finishes asynchronous data reading from board
+	@param buffer array where to store received data
+	@param length number of bytes to read, function changes this value to number of bytes actually received
+	@param contextHandle handle of which context to finish
+	@return false failure, true number of bytes received
+*/
+int ConnectionUSB::FinishDataReading(char *buffer, long &length, int contextHandle)
+{
+    if( contexts[contextHandle].used == true && contextHandle >= 0)
+    {
+    #ifndef __unix__
+    int status = 0;
+    if(InEndPt)
+        status = InEndPt->FinishDataXfer((unsigned char*)buffer, length, contexts[contextHandle].inOvLap, contexts[contextHandle].context);
+    contexts[contextHandle].used = false;
+    contexts[contextHandle].reset();
+    return length;
+    #else
+	length = contexts[contextHandle].bytesXfered;
+	contexts[contextHandle].used = false;
+	contexts[contextHandle].reset();
+	return length;
+    #endif
+    }
+    else
+        return 0;
+}
+
+int ConnectionUSB::ReadDataBlocking(char *buffer, long &length, int timeout_ms)
+{
+#ifndef __unix__
+    return InEndPt->XferData((unsigned char*)buffer, length);
+#else
+    return 0;
+#endif
+}
+
+
+/**
+	@brief Aborts reading operations
+*/
+void ConnectionUSB::AbortReading()
+{
+#ifndef __unix__
+	InEndPt->Abort();
+#else
+    for(int i=0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        libusb_cancel_transfer( contexts[i].transfer );
+    }
+#endif
+}
+
+/**
+	@brief Starts asynchronous data Sending to board
+	@param *buffer buffer to send
+	@param length number of bytes to send
+	@return handle of transfer context
+*/
+int ConnectionUSB::BeginDataSending(const char *buffer, long length)
+{
+    int i = 0;
+	//find not used context
+	bool contextFound = false;
+    for(i = 0; i<USB_MAX_CONTEXTS; i++)
+    {
+        if(!contextsToSend[i].used)
+        {
+            contextFound = true;
+            break;
+        }
+    }
+    if(!contextFound)
+        return -1;
+    contextsToSend[i].used = true;
+    #ifndef __unix__
+    if(OutEndPt)
+        contextsToSend[i].context = OutEndPt->BeginDataXfer((unsigned char*)buffer, length, contextsToSend[i].inOvLap);
+	return i;
+    #else
+    unsigned int Timeout = 1000;
+    libusb_transfer *tr = contextsToSend[i].transfer;
+    //libusb_set_iso_packet_lengths(contexts[i].transfer, 512*64);
+	libusb_fill_bulk_transfer(tr, dev_handle, 0x1, (unsigned char*)buffer, length, callback_libusbtransfer, &contextsToSend[i], Timeout);
+	contextsToSend[i].done = false;
+	contextsToSend[i].bytesXfered = 0;
+	contextsToSend[i].bytesExpected = length;
+    libusb_submit_transfer(tr);
+    #endif
+    return i;
+}
+
+/**
+	@brief Waits for asynchronous data sending
+	@param contextHandle handle of which context data to wait
+	@param timeout_ms number of miliseconds to wait
+	@return 1-data received, 0-data not received
+*/
+int ConnectionUSB::WaitForSending(int contextHandle, unsigned int timeout_ms)
+{
+    if( contextsToSend[contextHandle].used == true )
+    {
+    #ifndef __unix__
+	int status = 0;
+	if(OutEndPt)
+        status = OutEndPt->WaitForXfer(contextsToSend[contextHandle].inOvLap, timeout_ms);
+	return status;
+    #else
+    auto t1 = chrono::high_resolution_clock::now();
+    auto t2 = chrono::high_resolution_clock::now();
+    while(contextsToSend[contextHandle].done == false && std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count() < timeout_ms)
+	{
+	  /*  struct timeval tv;
+	    tv.tv_sec = 1;
+	    tv.tv_usec = 0;
+        int status = libusb_handle_events_timeout_completed(ctx, &tv, NULL);
+        if(status != 0)
+            printf("error libusb_handle_events %i\n", status);*/
+        t2 = chrono::high_resolution_clock::now();
+        //std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+	std::unique_lock<std::mutex> lck(contextsToSend[contextHandle].m_lock);
+    while(contextsToSend[contextHandle].done == false) //is changed in libusb callback
+    {
+        if(contextsToSend[contextHandle].mPacketProcessed.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+            return 0;
+    }
+	return contextsToSend[contextHandle].done == true;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Finishes asynchronous data sending to board
+	@param buffer array where to store received data
+	@param length number of bytes to read, function changes this value to number of bytes acctually received
+	@param contextHandle handle of which context to finish
+	@return false failure, true number of bytes sent
+*/
+int ConnectionUSB::FinishDataSending(const char *buffer, long &length, int contextHandle)
+{
+    if( contextsToSend[contextHandle].used == true)
+    {
+    #ifndef __unix__
+	if(OutEndPt)
+        OutEndPt->FinishDataXfer((unsigned char*)buffer, length, contextsToSend[contextHandle].inOvLap, contextsToSend[contextHandle].context);
+    contextsToSend[contextHandle].used = false;
+    contextsToSend[contextHandle].reset();
+    return length;
+    #else
+	length = contextsToSend[contextHandle].bytesXfered;
+	contextsToSend[contextHandle].used = false;
+    contextsToSend[contextHandle].reset();
+	return length;
+    #endif
+    }
+    else
+        return 0;
+}
+
+/**
+	@brief Aborts sending operations
+*/
+void ConnectionUSB::AbortSending()
+{
+#ifndef __unix__
+	OutEndPt->Abort();
+#else
+    for (int i = 0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        libusb_cancel_transfer(contextsToSend[i].transfer);
+    }
+    for(int i=0; i<USB_MAX_CONTEXTS; ++i)
+    {
+        contextsToSend[i].used = false;
+        contextsToSend[i].reset();
+    }
+#endif
+}
+
+int ConnectionUSB::GetOpenedIndex()
+{
+    return currentDeviceIndex;
+}
+
+/** @brief Returns found devices names
+    @return vector of device names
+*/
+vector<string> ConnectionUSB::GetDeviceNames()
+{
+    return m_deviceNames;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.h
new file mode 100644
index 0000000000000000000000000000000000000000..f3048c184200e5bb5bdb875392c957ca45c75a7b
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/ConnectionUSB.h
@@ -0,0 +1,144 @@
+/**
+@file   ConnectionUSB.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for data writing and reading through USB port
+*/
+
+#ifndef USB_PORT_CONNECTION_H
+#define USB_PORT_CONNECTION_H
+
+#include "IConnection.h"
+
+#ifndef __unix__
+#include "windows.h"
+#include "CyAPI.h"
+#else
+#include <libusb-1.0/libusb.h>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
+#endif
+
+#define USB_MAX_CONTEXTS 64 //maximum number of contexts for asynchronous transfers
+
+/** @brief Wrapper class for holding USB asynchronous transfers contexts
+*/
+class USBTransferContext
+{
+public:
+	USBTransferContext() : used(false)
+	{
+		#ifndef __unix__
+		inOvLap = new OVERLAPPED;
+		memset(inOvLap, 0, sizeof(OVERLAPPED));
+		inOvLap->hEvent = CreateEvent(NULL, false, false, NULL);
+		context = NULL;
+		#else
+		transfer = libusb_alloc_transfer(0);
+		bytesXfered = 0;
+		bytesExpected = 0;
+		done = 0;
+		#endif
+	}
+	~USBTransferContext()
+	{
+		#ifndef __unix__
+		CloseHandle(inOvLap->hEvent);
+		delete inOvLap;
+		#else
+		libusb_free_transfer(transfer);
+		#endif
+	}
+	bool reset()
+	{
+        if(used)
+            return false;
+        #ifndef __unix__
+        CloseHandle(inOvLap->hEvent);
+        memset(inOvLap, 0, sizeof(OVERLAPPED));
+        inOvLap->hEvent = CreateEvent(NULL, false, false, NULL);
+        #endif
+        return true;
+	}
+	bool used;
+	#ifndef __unix__
+	PUCHAR context;
+	OVERLAPPED *inOvLap;
+	#else
+	libusb_transfer* transfer;
+	long bytesXfered;
+	long bytesExpected;
+	bool done;
+	std::mutex m_lock;
+    std::condition_variable mPacketProcessed;
+	#endif
+};
+
+class ConnectionUSB : public IConnection
+{
+public:
+	ConnectionUSB();
+	~ConnectionUSB();
+
+    void FindDevices();
+	DeviceStatus Open();
+	DeviceStatus Open(unsigned index);
+	void Close();
+	bool IsOpen();
+	int GetOpenedIndex();
+
+	int Write(const unsigned char *buffer, int length, int timeout_ms = 0);
+	int Read(unsigned char *buffer, int length, int timeout_ms = 0);
+
+	virtual int BeginDataReading(char *buffer, long length);
+	virtual int WaitForReading(int contextHandle, unsigned int timeout_ms);
+	virtual int FinishDataReading(char *buffer, long &length, int contextHandle);
+	virtual void AbortReading();
+    virtual int ReadDataBlocking(char *buffer, long &length, int timeout_ms);
+
+	virtual int BeginDataSending(const char *buffer, long length);
+	virtual int WaitForSending(int contextHandle, unsigned int timeout_ms);
+	virtual int FinishDataSending(const char *buffer, long &length, int contextHandle);
+	virtual void AbortSending();
+
+	std::vector<std::string> GetDeviceNames();
+	int RefreshDeviceList();
+	void ClearComm();
+private:
+    int currentDeviceIndex;
+    std::string DeviceName();
+
+    std::vector<std::string> m_deviceNames;
+    std::string m_hardwareName;
+    int m_hardwareVer;
+
+	USBTransferContext contexts[USB_MAX_CONTEXTS];
+	USBTransferContext contextsToSend[USB_MAX_CONTEXTS];
+	void Initialize();
+
+	bool isConnected;
+	int currentPortIndex;
+
+	#ifndef __unix__
+	CCyUSBDevice *USBDevicePrimary;
+	//control endpoints for DigiRed
+	CCyControlEndPoint *InCtrlEndPt3;
+	CCyControlEndPoint *OutCtrlEndPt3;
+
+    //control endpoints for DigiGreen
+	CCyUSBEndPoint *OutCtrEndPt;
+	CCyUSBEndPoint *InCtrEndPt;
+
+    //end points for samples reading and writing
+	CCyUSBEndPoint *InEndPt;
+	CCyUSBEndPoint *OutEndPt;
+
+	#else
+    libusb_device **devs; //pointer to pointer of device, used to retrieve a list of devices
+    libusb_device_handle *dev_handle; //a device handle
+    libusb_context *ctx; //a libusb session
+    std::vector<std::pair<int,int> > m_dev_pid_vid;
+	#endif
+};
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/IConnection.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/IConnection.h
new file mode 100644
index 0000000000000000000000000000000000000000..5804f1149f104c4d834c710eaf6f38f75bc9a6d3
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/IConnection.h
@@ -0,0 +1,68 @@
+/**
+    @file IConnection.h
+    @author Lime Microsystems
+    @brief Interface class for connection types
+*/
+
+#ifndef ICONNECTION_H
+#define ICONNECTION_H
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+class IConnection
+{
+public:
+    /// Supported connection types.
+    enum eConnectionType
+    {
+	    CONNECTION_UNDEFINED = -1,
+	    COM_PORT = 0,
+	    USB_PORT = 1,
+	    SPI_PORT = 2,
+	    //insert new types here
+	    CONNECTION_TYPES_COUNT //used only for memory allocation
+    };
+
+    enum DeviceStatus
+    {
+        SUCCESS,
+        FAILURE,
+        END_POINTS_NOT_FOUND,
+        CANNOT_CLAIM_INTERFACE
+    };
+
+	IConnection() : m_connectionType(CONNECTION_UNDEFINED){};
+	virtual ~IConnection(){};
+	virtual int RefreshDeviceList() = 0;
+	virtual DeviceStatus Open(unsigned i) = 0;
+	virtual void Close() = 0;
+	virtual bool IsOpen() = 0;
+	virtual int GetOpenedIndex() = 0;
+
+	virtual int Write(const unsigned char *buffer, int length, int timeout_ms = 0) = 0;
+	virtual int Read(unsigned char *buffer, int length, int timeout_ms = 0) = 0;
+
+	virtual std::vector<std::string> GetDeviceNames() = 0;
+
+	virtual eConnectionType GetType() { return m_connectionType; };
+	virtual bool SetParam(const char *name, const char* value) {return false;};
+
+	virtual int BeginDataReading(char *buffer, long length){ return -1; };
+	virtual int WaitForReading(int contextHandle, unsigned int timeout_ms){ return 0;};
+	virtual int FinishDataReading(char *buffer, long &length, int contextHandle){ return 0;}
+	virtual void AbortReading(){};
+    virtual int ReadDataBlocking(char *buffer, long &length, int timeout_ms){ return 0; }
+
+	virtual int BeginDataSending(const char *buffer, long length){ return -1; };
+	virtual int WaitForSending(int contextHandle, unsigned int timeout_ms){ return 0;};
+	virtual int FinishDataSending(const char *buffer, long &length, int contextHandle){ return 0;}
+	virtual void AbortSending(){};
+protected:
+	eConnectionType m_connectionType;
+};
+
+#endif
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0e5ec667621f7b3c797aacba8ffc89742645c96f
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.cpp
@@ -0,0 +1,325 @@
+/**
+@file   LMScomms.cpp
+@author Lime Microsystems (www.limemicro.com)
+@brief  Implementation of data transmission to LMS boards
+*/
+
+#include "lmsComms.h"
+
+LMScomms::LMScomms(const IConnection::eConnectionType port_type) : ConnectionManager(port_type)
+{
+    callback_logData = nullptr;
+    unsigned short test = 0x1234;
+    unsigned char* bytes = (unsigned char*)&test;
+    if(bytes[0] == 0x12 && bytes[1] == 0x34)
+        mSystemBigEndian = true;
+    else
+        mSystemBigEndian = false;
+}
+
+LMScomms::~LMScomms()
+{
+}
+
+/** @brief Transfers data between packet and connected device
+    @param pkt packet containing output data and to receive incomming data
+    @return 0: success, other: failure
+*/
+LMScomms::TransferStatus LMScomms::TransferPacket(GenericPacket& pkt)
+{
+    std::lock_guard<std::mutex> lock(mControlPortLock);
+	TransferStatus status = TRANSFER_SUCCESS;
+    if(IsOpen() == false)
+        return NOT_CONNECTED;
+
+    int packetLen;
+    eLMS_PROTOCOL protocol = LMS_PROTOCOL_UNDEFINED;
+    if(activeControlPort->GetType() == IConnection::SPI_PORT)
+        protocol = LMS_PROTOCOL_NOVENA;
+    else
+        protocol = LMS_PROTOCOL_LMS64C;
+    switch(protocol)
+    {
+    case LMS_PROTOCOL_UNDEFINED:
+        return TRANSFER_FAILED;
+    case LMS_PROTOCOL_LMS64C:
+        packetLen = ProtocolLMS64C::pktLength;
+        break;
+    case LMS_PROTOCOL_NOVENA:
+        packetLen = pkt.outBuffer.size() > ProtocolNovena::pktLength ? ProtocolNovena::pktLength : pkt.outBuffer.size();
+        break;
+    default:
+        packetLen = 0;
+        return TRANSFER_FAILED;
+    }
+    int outLen = 0;
+    unsigned char* outBuffer = NULL;
+    outBuffer = PreparePacket(pkt, outLen, protocol);
+    unsigned char* inBuffer = new unsigned char[outLen];
+    memset(inBuffer, 0, outLen);
+
+    int outBufPos = 0;
+    int inDataPos = 0;
+    if(outLen == 0)
+    {
+        //printf("packet outlen = 0\n");
+        outLen = 1;
+    }
+
+    if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        bool transferData = true; //some commands are fake, so don't need transferring
+        if(pkt.cmd == CMD_GET_INFO)
+        {
+            //spi does not have GET INFO, fake it to inform what device it is
+            pkt.status = STATUS_COMPLETED_CMD;
+            pkt.inBuffer.clear();
+            pkt.inBuffer.resize(64, 0);
+            pkt.inBuffer[0] = 0; //firmware
+            pkt.inBuffer[1] = LMS_DEV_NOVENA; //device
+            pkt.inBuffer[2] = 0; //protocol
+            pkt.inBuffer[3] = 0; //hardware
+            pkt.inBuffer[4] = EXP_BOARD_UNSUPPORTED; //expansion
+            transferData = false;
+        }
+
+        if(transferData)
+        {
+            if (callback_logData)
+                callback_logData(true, outBuffer, outLen);
+            int bytesWritten = Write(outBuffer, outLen);
+            if( bytesWritten == outLen)
+            {
+                if(pkt.cmd == CMD_LMS7002_RD)
+                {
+                    inDataPos = Read(&inBuffer[inDataPos], outLen);
+                    if(inDataPos != outLen)
+                        status = TRANSFER_FAILED;
+                    else
+                    {
+                        if (callback_logData)
+                            callback_logData(false, inBuffer, inDataPos);
+                    }
+                }
+                ParsePacket(pkt, inBuffer, inDataPos, protocol);
+            }
+            else
+                status = TRANSFER_FAILED;
+        }
+    }
+    else
+    {
+        for(int i=0; i<outLen; i+=packetLen)
+        {
+            int bytesToSend = packetLen;
+            if (callback_logData)
+                callback_logData(true, &outBuffer[outBufPos], bytesToSend);
+            if( Write(&outBuffer[outBufPos], bytesToSend) )
+            {
+                outBufPos += packetLen;
+                long readLen = packetLen;
+                int bread = Read(&inBuffer[inDataPos], readLen);
+                if(bread != readLen && protocol != LMS_PROTOCOL_NOVENA)
+                {
+                    status = TRANSFER_FAILED;
+                    break;
+                }
+                if (callback_logData)
+                    callback_logData(false, &inBuffer[inDataPos], bread);
+                inDataPos += bread;
+            }
+            else
+            {
+                status = TRANSFER_FAILED;
+                break;
+            }
+        }
+        ParsePacket(pkt, inBuffer, inDataPos, protocol);
+    }
+    delete outBuffer;
+    delete inBuffer;
+    return status;
+}
+
+/** @brief Returns connected device information
+*/
+LMSinfo LMScomms::GetInfo()
+{
+    LMSinfo info;
+    info.device = LMS_DEV_UNKNOWN;
+    info.expansion = EXP_BOARD_UNKNOWN;
+    info.firmware = 0;
+    info.hardware = 0;
+    info.protocol = 0;
+    GenericPacket pkt;
+    pkt.cmd = CMD_GET_INFO;
+    LMScomms::TransferStatus status = TransferPacket(pkt);
+    if (status == LMScomms::TRANSFER_SUCCESS && pkt.inBuffer.size() >= 5)
+    {
+        info.firmware = pkt.inBuffer[0];
+        info.device = pkt.inBuffer[1] < LMS_DEV_COUNT ? (eLMS_DEV)pkt.inBuffer[1] : LMS_DEV_UNKNOWN;
+        info.protocol = pkt.inBuffer[2];
+        info.hardware = pkt.inBuffer[3];
+        info.expansion = pkt.inBuffer[4] < EXP_BOARD_COUNT ? (eEXP_BOARD)pkt.inBuffer[4] : EXP_BOARD_UNKNOWN;
+    }
+    return info;
+}
+
+/** @brief Takes generic packet and converts to specific protocol buffer
+    @param pkt generic data packet to convert
+    @param length returns length of returned buffer
+    @param protocol which protocol to use for data
+    @return pointer to data buffer, must be manually deleted after use
+*/
+unsigned char* LMScomms::PreparePacket(const GenericPacket& pkt, int& length, const eLMS_PROTOCOL protocol)
+{
+    unsigned char* buffer = NULL;
+    if(protocol == LMS_PROTOCOL_UNDEFINED)
+        return NULL;
+
+    if(protocol == LMS_PROTOCOL_LMS64C)
+    {
+        ProtocolLMS64C packet;
+        int maxDataLength = packet.maxDataLength;
+        packet.cmd = pkt.cmd;
+        packet.status = pkt.status;
+        int byteBlockRatio = 1; //block ratio - how many bytes in one block
+        switch( packet.cmd )
+        {
+        case CMD_PROG_MCU:
+        case CMD_GET_INFO:
+        case CMD_SI5351_RD:
+        case CMD_SI5356_RD:
+            byteBlockRatio = 1;
+            break;
+        case CMD_SI5351_WR:
+        case CMD_SI5356_WR:
+            byteBlockRatio = 2;
+            break;
+        case CMD_LMS7002_RD:
+        case CMD_BRDSPI_RD:
+        case CMD_BRDSPI8_RD:
+            byteBlockRatio = 2;
+            break;
+        case CMD_ADF4002_WR:
+            byteBlockRatio = 3;
+            break;
+        case CMD_LMS7002_WR:
+        case CMD_BRDSPI_WR:
+        case CMD_ANALOG_VAL_WR:
+            byteBlockRatio = 4;
+            break;
+        default:
+            byteBlockRatio = 1;
+        }
+        if (packet.cmd == CMD_LMS7002_RD || packet.cmd == CMD_BRDSPI_RD)
+            maxDataLength = maxDataLength/2;
+        if (packet.cmd == CMD_ANALOG_VAL_RD)
+            maxDataLength = maxDataLength / 4;
+        int blockCount = pkt.outBuffer.size()/byteBlockRatio;
+        int bufLen = blockCount/(maxDataLength/byteBlockRatio)
+                    +(blockCount%(maxDataLength/byteBlockRatio)!=0);
+        bufLen *= packet.pktLength;
+        if(bufLen == 0)
+            bufLen = packet.pktLength;
+        buffer = new unsigned char[bufLen];
+        memset(buffer, 0, bufLen);
+        int srcPos = 0;
+        for(int j=0; j*packet.pktLength<bufLen; ++j)
+        {
+            int pktPos = j*packet.pktLength;
+            buffer[pktPos] = packet.cmd;
+            buffer[pktPos+1] = packet.status;
+            if(blockCount > (maxDataLength/byteBlockRatio))
+            {
+                buffer[pktPos+2] = maxDataLength/byteBlockRatio;
+                blockCount -= buffer[pktPos+2];
+            }
+            else
+                buffer[pktPos+2] = blockCount;
+            memcpy(&buffer[pktPos+3], packet.reserved, sizeof(packet.reserved));
+            int bytesToPack = (maxDataLength/byteBlockRatio)*byteBlockRatio;
+            for (int k = 0; k<bytesToPack && srcPos < pkt.outBuffer.size(); ++srcPos, ++k)
+                buffer[pktPos + 8 + k] = pkt.outBuffer[srcPos];
+        }
+        length = bufLen;
+    }
+    else if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        if(pkt.cmd == CMD_LMS7002_RST)
+        {
+            buffer = new unsigned char[8];
+            buffer[0] = 0x88;
+            buffer[1] = 0x06;
+            buffer[2] = 0x00;
+            buffer[3] = 0x18;
+            buffer[4] = 0x88;
+            buffer[5] = 0x06;
+            buffer[6] = 0x00;
+            buffer[7] = 0x38;
+            length = 8;
+        }
+        else
+        {
+            buffer = new unsigned char[pkt.outBuffer.size()];
+            memcpy(buffer, &pkt.outBuffer[0], pkt.outBuffer.size());
+            if (pkt.cmd == CMD_LMS7002_WR)
+            {
+                for(int i=0; i<pkt.outBuffer.size(); i+=4)
+                    buffer[i] |= 0x80;
+            }
+            length = pkt.outBuffer.size();
+        }
+    }
+    return buffer;
+}
+
+/** @brief Parses given data buffer into generic packet
+    @param pkt destination packet
+    @param buffer received data from board
+    @param length received buffer length
+    @param protocol which protocol to use for data parsing
+    @return 1:success, 0:failure
+*/
+int LMScomms::ParsePacket(GenericPacket& pkt, const unsigned char* buffer, const int length, const eLMS_PROTOCOL protocol)
+{
+    if(protocol == LMS_PROTOCOL_UNDEFINED)
+        return -1;
+
+    if(protocol == LMS_PROTOCOL_LMS64C)
+    {
+        ProtocolLMS64C packet;
+        int inBufPos = 0;
+        pkt.inBuffer.resize(packet.maxDataLength*(length / packet.pktLength + (length % packet.pktLength)), 0);
+        for(int i=0; i<length; i+=packet.pktLength)
+        {
+            pkt.cmd = (eCMD_LMS)buffer[i];
+            pkt.status = (eCMD_STATUS)buffer[i+1];
+            memcpy(&pkt.inBuffer[inBufPos], &buffer[i+8], packet.maxDataLength);
+            inBufPos += packet.maxDataLength;
+        }
+    }
+    else if(protocol == LMS_PROTOCOL_NOVENA)
+    {
+        pkt.cmd = CMD_LMS7002_RD;
+        pkt.status = STATUS_COMPLETED_CMD;
+        pkt.inBuffer.clear();
+        for(int i=0; i<length; i+=2)
+        {
+            //reading from spi returns only registers values
+            //fill addresses as zeros to match generic format of address, value pairs
+            pkt.inBuffer.push_back(0); //should be address msb
+            pkt.inBuffer.push_back(0); //should be address lsb
+            pkt.inBuffer.push_back(buffer[i]);
+            pkt.inBuffer.push_back(buffer[i+1]);
+        }
+    }
+    return 1;
+}
+
+/** @brief Sets callback function which gets called each time data is sent or received
+*/
+void LMScomms::SetDataLogCallback(std::function<void(bool, const unsigned char*, const unsigned int)> callback)
+{
+    callback_logData = callback;
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.h
new file mode 100644
index 0000000000000000000000000000000000000000..f811d293025e0e7c2dce6289dd6e0cbaf04ba278
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/connectionManager/lmsComms.h
@@ -0,0 +1,111 @@
+/**
+@file   LMScomms.h
+@author Lime Microsystems (www.limemicro.com)
+@brief  Class for handling data transmission to LMS boards
+*/
+
+#ifndef LMS_COMMS_H
+#define LMS_COMMS_H
+
+#include "lms7002_defines.h"
+#include "ConnectionManager.h"
+#include <string.h>
+#include <mutex>
+
+struct LMSinfo
+{
+    eLMS_DEV device;
+    eEXP_BOARD expansion;
+    int firmware;
+    int hardware;
+    int protocol;
+};
+
+/*  @brief Class for abstracting transfering data to and from chip
+*/
+class LMScomms : public ConnectionManager
+{	
+public:
+	enum TransferStatus
+	{
+		TRANSFER_SUCCESS,
+		TRANSFER_FAILED,
+		NOT_CONNECTED
+	};
+
+    enum eLMS_PROTOCOL
+    {
+        LMS_PROTOCOL_UNDEFINED = 0,
+        LMS_PROTOCOL_DIGIC,
+        LMS_PROTOCOL_LMS64C,
+        LMS_PROTOCOL_NOVENA,
+    };
+    struct ProtocolDIGIC
+    {
+        static const int pktLength = 64;
+        static const int maxDataLength = 60;
+        ProtocolDIGIC() : cmd(0), i2cAddr(0), blockCount(0) {};
+        unsigned char cmd;
+        unsigned char i2cAddr;
+        unsigned char blockCount;
+        unsigned char reserved;
+        unsigned char data[maxDataLength];
+    };
+
+    struct ProtocolLMS64C
+    {
+        static const int pktLength = 64;
+        static const int maxDataLength = 56;
+        ProtocolLMS64C() :cmd(0),status(STATUS_UNDEFINED),blockCount(0)
+        {
+            memset(reserved, 0, 5);
+        };
+        unsigned char cmd;
+        unsigned char status;
+        unsigned char blockCount;
+        unsigned char reserved[5];
+        unsigned char data[maxDataLength];
+    };
+
+    struct ProtocolNovena
+    {
+        static const int pktLength = 128;
+        static const int maxDataLength = 128;
+        ProtocolNovena() :cmd(0),status(0) {};
+        unsigned char cmd;
+        unsigned char status;
+        unsigned char blockCount;
+        unsigned char data[maxDataLength];
+    };
+
+    struct GenericPacket
+    {   
+        GenericPacket()
+        {
+            cmd = CMD_GET_INFO;
+            status = STATUS_UNDEFINED;
+        }
+
+        eCMD_LMS cmd;
+        eCMD_STATUS status;
+        vector<unsigned char> outBuffer;
+        vector<unsigned char> inBuffer;
+    };
+
+    LMScomms(const IConnection::eConnectionType port_type);
+    ~LMScomms();
+
+    virtual TransferStatus TransferPacket(GenericPacket &pkt);
+    LMSinfo GetInfo();
+    void SetDataLogCallback(std::function<void(bool, const unsigned char*, const unsigned int)> callback);
+protected:
+    std::function<void(bool, const unsigned char*, const unsigned int)> callback_logData;
+    std::mutex mControlPortLock;
+    unsigned char* PreparePacket(const GenericPacket &pkt, int &length, const eLMS_PROTOCOL protocol);
+    int ParsePacket(GenericPacket &pkt, const unsigned char* buffer, const int length, const eLMS_PROTOCOL protocol);
+protected:
+    bool mSystemBigEndian;
+};
+
+#endif // LMS_COMMS_H
+
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/dataTypes.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/dataTypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..cba2b7341e2ad89ccdb8047d5fbb9628674e629e
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/dataTypes.h
@@ -0,0 +1,33 @@
+#ifndef LMS_DATA_TYPES_H
+#define LMS_DATA_TYPES_H
+
+typedef struct
+{
+    uint8_t reserved[8];
+    uint64_t counter;
+    int16_t samples[2040];
+} PacketLTE;
+
+typedef struct
+{
+    int16_t i;
+    int16_t q;
+} complex16_t;
+
+typedef struct
+{
+    uint64_t timestamp; //timestamp of the packet
+    uint16_t first; //index of first unused sample in samples[]
+    uint16_t last; //end index of samples
+    static const uint16_t samplesCount = 1024; //maximum number of samples in packet
+    complex16_t samples[samplesCount]; //must be power of two    
+} SamplesPacket;
+
+complex16_t operator &=(complex16_t & other1, const complex16_t & other) // copy assignment
+{    
+    other1.i = other.i;
+    other1.q = other.q;
+    return other1;
+}
+
+#endif
\ No newline at end of file
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/fifo.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/fifo.h
new file mode 100644
index 0000000000000000000000000000000000000000..1868c64af71d1205e0aeb422c9ab9ea87635a747
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/fifo.h
@@ -0,0 +1,180 @@
+#ifndef LMS_FIFO_BUFFER_H
+#define LMS_FIFO_BUFFER_H
+
+#include <mutex>
+#include <atomic>
+#include <vector>
+#include <thread>
+#include <condition_variable>
+#include "dataTypes.h"
+
+class LMS_SamplesFIFO
+{
+public:
+    struct BufferInfo
+    {
+        uint32_t size;
+        uint32_t itemsFilled;
+    };
+
+    BufferInfo GetInfo()
+    {
+        std::unique_lock<std::mutex> lck2(readLock);
+        std::unique_lock<std::mutex> lck(writeLock);
+        BufferInfo stats;
+        stats.size = (uint32_t)mBuffer.size();
+        stats.itemsFilled = mElementsFilled.load();
+        return stats;
+    }
+
+	LMS_SamplesFIFO(uint32_t bufLength)
+	{
+        Reset(bufLength);
+	}
+	
+	~LMS_SamplesFIFO(){};
+	
+    /** @brief inserts items to ring buffer
+        @param buffer data source
+        @param itemCount number of buffer items to insert
+        @param timeout_ms timeout duration for operation
+        @param overwrite enable to overwrite oldest items inside the buffer
+        @return number of items added
+    */
+	uint32_t push_packet(SamplesPacket *buffer, const uint32_t itemCount, const uint32_t timeout_ms, const bool overwrite = true)
+	{	
+        uint32_t addedItems = 0;
+        std::unique_lock<std::mutex> lck(writeLock);
+        while (addedItems < itemCount)
+        {            
+            while (mElementsFilled.load() >= mBuffer.size()) //wait for free space to insert items
+            {
+                if (canWrite.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                    return addedItems; //dropped all items
+            }
+
+            uint32_t itemsToInsert = itemCount - addedItems;
+            uint32_t itemsToEnd = (uint32_t)mBuffer.size() - mTail.load(); //might need to split memcpy into two operations
+            if (itemsToInsert > itemsToEnd)
+            {
+                memcpy(&mBuffer[mTail], &buffer[addedItems], itemsToEnd*sizeof(SamplesPacket));
+                memcpy(&mBuffer[0], &buffer[addedItems+itemsToEnd], (itemsToInsert - itemsToEnd)*sizeof(SamplesPacket));
+            }
+            else
+                memcpy(&mBuffer[mTail], &buffer[addedItems], itemsToInsert*sizeof(SamplesPacket));
+            mTail.store((mTail.load() + itemsToInsert) & (mBuffer.size() - 1));
+            mElementsFilled.fetch_add(itemsToInsert);
+            canRead.notify_one();
+            addedItems += itemsToInsert;
+        }
+        return addedItems;
+	}
+
+    /** @brief inserts items to ring buffer
+    @param buffer data source
+    @param itemCount number of buffer items to insert
+    @param timeout_ms timeout duration for operation
+    @param overwrite enable to overwrite oldest items inside the buffer
+    @return number of items added
+    */
+    uint32_t push_samples(const complex16_t *buffer, const uint32_t samplesCount, uint64_t timestamp, const uint32_t timeout_ms, const bool overwrite = true)
+    {
+        assert(buffer != nullptr);
+        const int samplesInPacket = SamplesPacket::samplesCount;
+        uint32_t samplesTaken = 0;
+        std::unique_lock<std::mutex> lck(writeLock);
+        while (samplesTaken < samplesCount)
+        {   
+            while (mElementsFilled.load() >= mBuffer.size()) //buffer might be full, wait for free slots
+            {
+                if (canWrite.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                    return samplesTaken;
+            }
+
+            int tailIndex = mTail.load(); //which element to fill
+            while (mElementsFilled.load() < mBuffer.size() && samplesTaken < samplesCount) // not to release lock too often
+            {
+                mBuffer[tailIndex].timestamp = timestamp + samplesTaken;
+                mBuffer[tailIndex].first = 0;
+                mBuffer[tailIndex].last = 0;
+                while (mBuffer[tailIndex].last < samplesInPacket && samplesTaken < samplesCount)
+                {
+                    mBuffer[tailIndex].samples[mBuffer[tailIndex].last++] = buffer[samplesTaken++];
+                }
+                mTail.store((tailIndex + 1) & (mBuffer.size() - 1));//advance to next one
+                tailIndex = mTail.load();
+                mElementsFilled.fetch_add(1);
+                canRead.notify_one();
+            }
+        }
+        return samplesTaken;
+    }
+	
+    /** @brief Takes items out of ring buffer
+        @param buffer data destination
+        @param samplesCount number of samples to pop
+		@param timestamp returns timestamp of the first sample in buffer
+        @param timeout_ms timeout duration for operation
+        @return number of samples returned
+    */
+    uint32_t pop_samples(complex16_t* buffer, const uint32_t samplesCount, uint64_t *timestamp, const uint32_t timeout_ms)
+	{
+        assert(buffer != nullptr);
+        const int samplesInPacket = SamplesPacket::samplesCount;
+        uint32_t samplesFilled = 0;		
+		*timestamp = 0;
+        std::unique_lock<std::mutex> lck(readLock);
+        while (samplesFilled < samplesCount)
+        {   
+            while (mElementsFilled.load() == 0) //buffer might be empty, wait for packets
+            {
+                if (canRead.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                    return samplesFilled;
+            }
+			if(samplesFilled == 0)
+                *timestamp = mBuffer[mHead.load()].timestamp + mBuffer[mHead.load()].first;
+			
+			while(mElementsFilled.load() > 0 && samplesFilled < samplesCount)
+			{	
+				int headIndex = mHead.load();
+                while (mBuffer[headIndex].first < mBuffer[headIndex].last && samplesFilled < samplesCount)
+				{
+					buffer[samplesFilled++] = mBuffer[headIndex].samples[mBuffer[headIndex].first++];
+				}
+                if (mBuffer[headIndex].first == mBuffer[headIndex].last) //packet depleated
+				{
+                    mBuffer[headIndex].first = 0;
+                    mBuffer[headIndex].last = 0;
+                    mBuffer[headIndex].timestamp = 0;
+					mHead.store( (headIndex + 1) & (mBuffer.size() - 1) );//advance to next one
+                    headIndex = mHead.load();
+					mElementsFilled.fetch_sub(1);
+                    canWrite.notify_one();
+				}
+			}
+        }
+        return samplesFilled;
+	}
+	
+	void Reset(uint32_t bufLength)
+	{
+        std::unique_lock<std::mutex> lck(writeLock);
+        std::unique_lock<std::mutex> lck2(readLock);
+		mBuffer.resize(bufLength);
+		mHead.store(0);
+		mTail.store(0);
+        mElementsFilled.store(0);
+	}
+	
+protected:
+	std::vector<SamplesPacket> mBuffer;
+    std::atomic<uint32_t> mHead;
+    std::atomic<uint32_t> mTail;
+    std::mutex writeLock;
+    std::mutex readLock;
+	std::atomic<uint32_t> mElementsFilled;
+    std::condition_variable canWrite;
+    std::condition_variable canRead;
+};
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/ringBuffer.h b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/ringBuffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..e4882f8924cf624b6554b6e04aa95898ff40d66d
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/ringBuffer.h
@@ -0,0 +1,143 @@
+#ifndef LMS_RING_BUFFER_H
+#define LMS_RING_BUFFER_H
+
+#include <mutex>
+#include <atomic>
+#include <vector>
+#include <condition_variable>
+
+template<class T>
+class RingBuffer
+{
+public:
+    struct BufferInfo
+    {
+        uint32_t size;
+        uint32_t itemsFilled;
+    };
+
+    BufferInfo GetInfo()
+    {
+        unique_lock<mutex> lck(mLock);
+        BufferInfo stats;
+        stats.size = (uint32_t)mBuffer.size();
+        stats.itemsFilled = mElementsFilled;
+        return stats;
+    }
+
+	RingBuffer(uint32_t bufLength)
+	{
+        Reset(bufLength);
+	}
+	~RingBuffer(){};
+	
+    /** @brief inserts items to ring buffer
+        @param buffer data source
+        @param itemCount number of buffer items to insert
+        @param timeout_ms timeout duration for operation
+        @return number of items added
+    */
+	uint32_t push_back(const T* buffer, const uint32_t itemCount, const uint32_t timeout_ms)
+	{	
+        uint32_t addedItems = 0;
+        while (addedItems < itemCount)
+        {
+            unique_lock<mutex> lck(mLock);
+            while (mElementsFilled >= mBuffer.size()) //wait for free space to insert items
+            {
+                if (canWrite.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                    return addedItems; //dropped all items
+            }
+
+            uint32_t itemsToInsert = itemCount - addedItems;
+            uint32_t itemsToEnd = (uint32_t)mBuffer.size() - mTail.load(); //might need to split memcpy into two operations
+            if (itemsToInsert > itemsToEnd)
+            {
+                memcpy(&mBuffer[mTail], &buffer[addedItems], itemsToEnd*sizeof(T));
+                memcpy(&mBuffer[0], &buffer[addedItems+itemsToEnd], (itemsToInsert - itemsToEnd)*sizeof(T));
+            }
+            else
+                memcpy(&mBuffer[mTail], &buffer[addedItems], itemsToInsert*sizeof(T));
+            mTail.store((mTail.load() + itemsToInsert) & (mBuffer.size() - 1));
+            mElementsFilled += itemsToInsert;            
+            lck.unlock();
+            canRead.notify_one();
+            addedItems += itemsToInsert;
+        }
+        return addedItems;
+	}
+	
+    /** @brief Takes items out of ring buffer
+        @param buffer data destination
+        @param itemCount number of items to extract from ring buffer
+        @param timeout_ms timeout duration for operation
+        @return number of items returned
+    */
+	uint32_t pop_front(T* buffer, const uint32_t itemCount, const uint32_t timeout_ms)
+	{
+        assert(buffer != nullptr);
+        uint32_t itemsTaken = 0;
+        T* destBuffer = buffer;
+        while (itemsTaken < itemCount)
+        {
+            unique_lock<mutex> lck(mLock);
+            while (mElementsFilled == 0) //buffer might be empty, wait for items
+            {
+                if (canRead.wait_for(lck, std::chrono::milliseconds(timeout_ms)) == std::cv_status::timeout)
+                    return itemsTaken;
+            }
+
+            unsigned int itemsToCopy = itemCount - itemsTaken;
+            if (itemsToCopy > mElementsFilled)
+                itemsToCopy = mElementsFilled;
+            unsigned int itemsToEnd = (uint32_t)mBuffer.size() - mHead.load(); //migth need to split memcpy into two operations
+            if (itemsToEnd < itemsToCopy)
+            {
+                memcpy(&destBuffer[itemsTaken], &mBuffer[mHead.load()], sizeof(T)*itemsToEnd);
+                memcpy(&destBuffer[itemsTaken+itemsToEnd], &mBuffer[0], sizeof(T)*(itemsToCopy - itemsToEnd));
+                mHead.store((itemsToCopy - itemsToEnd) & (mBuffer.size() - 1));
+            }
+            else
+            {
+                memcpy(&destBuffer[itemsTaken], &mBuffer[mHead.load()], sizeof(T)*itemsToCopy);
+                int headVal = mHead.load();
+                int valueToStore = (headVal + itemsToCopy) & (mBuffer.size() - 1);
+                mHead.store(valueToStore);
+                headVal = mHead.load();
+            }
+            mElementsFilled -= itemsToCopy;
+            lck.unlock();
+            canWrite.notify_one();
+            itemsTaken += itemsToCopy;
+        }
+        return itemsTaken;
+	}
+	
+	void Reset(uint32_t bufLength)
+	{
+        std::unique_lock<std::mutex> lck(mLock);        
+        if (bufLength >= (uint32_t)(1 << 31))
+            bufLength = (uint32_t)(1 << 31);
+        for (int i = 0; i < 32; ++i)
+            if ((1 << i) >= bufLength)
+            {
+                bufLength = (1 << i);
+                break;
+            }
+        mBuffer.resize(bufLength);
+		mHead.store(0);
+		mTail.store(0);
+		mElementsFilled = 0;
+	}
+	
+protected:
+	std::vector<T> mBuffer;
+    std::atomic<uint32_t> mHead;
+    std::atomic<uint32_t> mTail;
+    std::mutex mLock;
+	uint32_t mElementsFilled;
+    std::condition_variable canWrite;
+    std::condition_variable canRead;
+};
+
+#endif
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3ca15c66602c7760a563df391de9a8ba2f09a453
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
@@ -0,0 +1,879 @@
+/*******************************************************************************
+    OpenAirInterface
+    Copyright(c) 1999 - 2014 Eurecom
+
+    OpenAirInterface is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+
+    OpenAirInterface is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenAirInterface.The full GNU General Public License is
+    included in this distribution in the file called "COPYING". If not,
+    see <http://www.gnu.org/licenses/>.
+
+   Contact Information
+   OpenAirInterface Admin: openair_admin@eurecom.fr
+   OpenAirInterface Tech : openair_tech@eurecom.fr
+   OpenAirInterface Dev  : openair4g-devel@eurecom.fr
+
+   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+
+ *******************************************************************************/
+
+
+#include <arpa/inet.h>
+#include <linux/if_packet.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/ether.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "common_lib.h"
+#include "LMS_SDR.h"
+#include "LMS7002M.h"
+#include "Si5351C.h"
+#include "LMS_StreamBoard.h"
+#include "LMS7002M_RegistersMap.h"
+
+#include <cmath>
+
+
+///define for parameter enumeration if prefix might be needed
+#define LMS7param(id) id
+
+LMScomms* usbport;
+LMScomms* comport;
+LMS7002M* lms7;
+Si5351C* Si;
+LMS_StreamBoard *lmsStream;
+
+#define RXDCLENGTH 4096
+#define NUMBUFF 40
+int16_t cos_fsover8[8]  = {2047,   1447,      0,  -1448,  -2047,  -1448,     0,   1447};
+int16_t cos_3fsover8[8] = {2047,  -1448,      0,   1447,  -2047,   1447,     0,  -1448};
+
+extern "C"
+{
+int write_output(const char *fname,const char *vname,void *data,int length,int dec,char format);
+}
+
+int trx_lms_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps, int antenna_id, int flags) {
+  
+ LMS_TRxWrite((int16_t*)buff[0], nsamps,0, timestamp);
+
+ return nsamps;
+}
+
+
+int trx_lms_read(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps, int antenna_id) {
+    
+  uint64_t timestamp;
+  int16_t *dst_ptr = (int16_t*) buff[0];
+  int ret;
+  ret = LMS_TRxRead(dst_ptr, nsamps,0,&timestamp, 10);
+  *ptimestamp=timestamp;
+
+  return ret;   
+}
+void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index) {
+
+  int i=0;
+  // loop through calibration table to find best adjustment factor for RX frequency
+  double min_diff = 6e9,diff;
+
+  while (openair0_cfg->rx_gain_calib_table[i].freq>0) {
+    diff = fabs(openair0_cfg->rx_freq[chain_index] - openair0_cfg->rx_gain_calib_table[i].freq);
+    printf("cal %d: freq %f, offset %f, diff %f\n",
+	   i,
+	   openair0_cfg->rx_gain_calib_table[i].freq,
+	   openair0_cfg->rx_gain_calib_table[i].offset,diff);
+    if (min_diff > diff) {
+      min_diff = diff;
+      openair0_cfg->rx_gain_offset[chain_index] = openair0_cfg->rx_gain_calib_table[i].offset;
+    }
+    i++;
+  }
+  
+}
+/*
+void calibrate_rf(openair0_device *device) {
+
+  openair0_timestamp ptimestamp;
+  int16_t *calib_buffp,*calib_tx_buffp;
+  int16_t calib_buff[2*RXDCLENGTH];
+  int16_t calib_tx_buff[2*RXDCLENGTH];
+  int i,j;
+  int8_t offI,offQ,offIold,offQold,offInew,offQnew,offphase,offphaseold,offphasenew,offgain,offgainold,offgainnew;
+  int32_t meanI,meanQ,meanIold,meanQold;
+  int cnt=0,loop;
+  liblms7_status opStatus;
+  int16_t dcoffi;
+  int16_t dcoffq;
+  int16_t dccorri;
+  int16_t dccorrq;
+    const int16_t firCoefs[] =
+    {
+        -2531,
+        -517,
+        2708,
+        188,
+        -3059,
+        216,
+        3569,
+        -770,
+        -4199,
+        1541,
+        4886,
+        -2577,
+        -5552,
+        3909,
+        6108,
+        -5537,
+        -6457,
+        7440,
+        6507,
+        -9566,
+        -6174,
+        11845,
+        5391,
+        -14179,
+        -4110,
+        16457,
+        2310,
+        -18561,
+        0,
+        20369,
+        -2780,
+        -21752,
+        5963,
+        22610,
+        -9456,
+        -22859,
+        13127,
+        22444,
+        -16854,
+        -21319,
+        20489,
+        19492,
+        -23883,
+        -17002,
+        26881,
+        13902,
+        -29372,
+        -10313,
+        31226,
+        6345,
+        -32380,
+        -2141,
+        32767,
+        -2141,
+        -32380,
+        6345,
+        31226,
+        -10313,
+        -29372,
+        13902,
+        26881,
+        -17002,
+        -23883,
+        19492,
+        20489,
+        -21319,
+        -16854,
+        22444,
+        13127,
+        -22859,
+        -9456,
+        22610,
+        5963,
+        -21752,
+        -2780,
+        20369,
+        0,
+        -18561,
+        2310,
+        16457,
+        -4110,
+        -14179,
+        5391,
+        11845,
+        -6174,
+        -9566,
+        6507,
+        7440,
+        -6457,
+        -5537,
+        6108,
+        3909,
+        -5552,
+        -2577,
+        4886,
+        1541,
+        -4199,
+        -770,
+        3569,
+        216,
+        -3059,
+        188,
+        2708,
+        -517,
+        -2531
+    };
+
+  j=0;
+  for (i=0;i<RXDCLENGTH;i++) {
+    calib_tx_buff[j++] = cos_fsover8[i&7];
+    calib_tx_buff[j++] = cos_fsover8[(i+6)&7];  // sin
+  }
+  calib_buffp = &calib_buff[0];
+  calib_tx_buffp = &calib_tx_buff[0];
+
+  lms7->BackupAllRegisters();
+  uint8_t ch = (uint8_t)lms7->Get_SPI_Reg_bits(LMS7param(MAC));
+  //Stage 1
+  uint8_t sel_band1_trf = (uint8_t)lms7->Get_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF));
+  uint8_t sel_band2_trf = (uint8_t)lms7->Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF));
+  {
+    uint16_t requiredRegs[] = { 0x0400, 0x040A, 0x010D, 0x040C };
+    uint16_t requiredMask[] = { 0x6000, 0x3007, 0x0040, 0x00FF }; //CAPSEL, AGC_MODE, AGC_AVG, EN_DCOFF, Bypasses
+    uint16_t requiredValue[] = { 0x0000, 0x1007, 0x0040, 0x00BD };
+    
+    lms7->Modify_SPI_Reg_mask(requiredRegs, requiredMask, requiredValue, 0, 3);
+  }
+
+  //  opStatus = lms7->SetFrequencySX(LMS7002M::Rx, device->openair0_cfg[0].tx_freq[0]/1e6,30.72);
+  // put TX on fs/4
+  opStatus = lms7->CalibrateRxSetup(device->openair0_cfg[0].sample_rate/1e6);
+  if (opStatus != LIBLMS7_SUCCESS) {
+    printf("Cannot calibrate for %f MHz\n",device->openair0_cfg[0].sample_rate/1e6);
+    exit(-1);
+  }
+    // fill TX buffer with fs/8 complex sinusoid
+  offIold=offQold=64;
+  lms7->SetRxDCOFF(offIold,offQold);
+  LMS_RxStart();  
+  for (i=0;i<NUMBUFF;i++)
+    trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+
+  for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
+    meanIold+=calib_buff[j++];
+    meanQold+=calib_buff[j++];
+  }
+  meanIold/=RXDCLENGTH;
+  meanQold/=RXDCLENGTH;
+  printf("[LMS] RX DC: (%d,%d) => (%d,%d)\n",offIold,offQold,meanIold,meanQold);
+
+  offI=offQ=-64;
+  lms7->SetRxDCOFF(offI,offQ);
+
+  for (i=0;i<NUMBUFF;i++)
+    trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+
+  for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+    meanI+=calib_buff[j++];
+    meanQ+=calib_buff[j++];
+  }
+  meanI/=RXDCLENGTH;
+  meanQ/=RXDCLENGTH;
+  printf("[LMS] RX DC: (%d,%d) => (%d,%d)\n",offI,offQ,meanI,meanQ);
+
+  while (cnt++ < 7) {
+
+    offInew=(offIold+offI)>>1;
+    offQnew=(offQold+offQ)>>1;
+
+    if (meanI*meanI < meanIold*meanIold) {
+      meanIold = meanI;
+      offIold = offI;
+      printf("[LMS] *** RX DC: offI %d => %d\n",offIold,meanI);
+    }
+    if (meanQ*meanQ < meanQold*meanQold) {
+      meanQold = meanQ;
+      offQold = offQ;
+      printf("[LMS] *** RX DC: offQ %d => %d\n",offQold,meanQ);
+    }
+    offI = offInew;
+    offQ = offQnew;
+
+    lms7->SetRxDCOFF(offI,offQ);
+
+    for (i=0;i<NUMBUFF;i++)
+      trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+
+    for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+      meanI+=calib_buff[j++];
+      meanQ+=calib_buff[j++];
+    }
+    meanI/=RXDCLENGTH;
+    meanQ/=RXDCLENGTH;
+    printf("[LMS] RX DC: (%d,%d) => (%d,%d)\n",offI,offQ,meanI,meanQ);
+  }
+
+  if (meanI*meanI < meanIold*meanIold) {
+    meanIold = meanI;
+    offIold = offI;
+    printf("[LMS] *** RX DC: offI %d => %d\n",offIold,meanI);
+  }
+  if (meanQ*meanQ < meanQold*meanQold) {
+    meanQold = meanQ;
+    offQold = offQ;
+    printf("[LMS] *** RX DC: offQ %d => %d\n",offQold,meanQ);
+  }
+  
+  printf("[LMS] RX DC: (%d,%d) => (%d,%d)\n",offIold,offQold,meanIold,meanQold);
+  
+  lms7->SetRxDCOFF(offIold,offQold);
+
+  dcoffi = offIold;
+  dcoffq = offQold;
+
+  lms7->Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+  lms7->Modify_SPI_Reg_bits(LMS7param(AGC_MODE_RXTSP), 1);
+  lms7->Modify_SPI_Reg_bits(LMS7param(CAPSEL), 0);
+
+  // TX LO leakage
+  offQold=offIold=127;
+  lms7->SPI_write(0x0204,(((int16_t)offIold)<<7)|offQold);
+
+  {
+    uint16_t requiredRegs[] = { 0x0400, 0x040A, 0x010D, 0x040C };
+    uint16_t requiredMask[] = { 0x6000, 0x3007, 0x0040, 0x00FF }; //CAPSEL, AGC_MODE, AGC_AVG, EN_DCOFF, Bypasses
+    uint16_t requiredValue[] = { 0x0000, 0x1007, 0x0040, 0x00BD };
+    
+    lms7->Modify_SPI_Reg_mask(requiredRegs, requiredMask, requiredValue, 0, 3);
+  }
+  sel_band1_trf = (uint8_t)lms7->Get_SPI_Reg_bits(LMS7param(SEL_BAND1_TRF));
+  sel_band2_trf = (uint8_t)lms7->Get_SPI_Reg_bits(LMS7param(SEL_BAND2_TRF));
+  //B
+  lms7->Modify_SPI_Reg_bits(0x0100, 0, 0, 1); //EN_G_TRF 1
+  if (sel_band1_trf == 1)
+    {
+      lms7->Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_1_RFE), 0); //PD_RLOOPB_1_RFE 0
+      lms7->Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB1_RFE), 0); //EN_INSHSW_LB1 0
+    }
+  if (sel_band2_trf == 1)
+    {
+      lms7->Modify_SPI_Reg_bits(LMS7param(PD_RLOOPB_2_RFE), 0); //PD_RLOOPB_2_RFE 0
+      lms7->Modify_SPI_Reg_bits(LMS7param(EN_INSHSW_LB2_RFE), 0); // EN_INSHSW_LB2 0
+    }
+  //  FixRXSaturation();
+  
+  lms7->Modify_SPI_Reg_bits(LMS7param(GFIR3_BYP_RXTSP), 0); //GFIR3_BYP 0
+  lms7->Modify_SPI_Reg_bits(LMS7param(HBD_OVR_RXTSP), 2);
+  lms7->Modify_SPI_Reg_bits(LMS7param(GFIR3_L_RXTSP), 7);
+  lms7->Modify_SPI_Reg_bits(LMS7param(GFIR3_N_RXTSP), 7);
+  
+  lms7->SetGFIRCoefficients(LMS7002M::Rx, 2, firCoefs, sizeof(firCoefs) / sizeof(int16_t));
+    
+  for (i=0;i<NUMBUFF;i++) {
+    trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+    trx_lms_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
+  }
+
+  write_output("calibrx.m","rxs",calib_buffp,RXDCLENGTH,1,1);
+  exit(-1);
+  for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
+    switch (i&3) {
+    case 0:
+      meanIold+=calib_buff[j++];
+      break;
+    case 1:
+      meanQold+=calib_buff[j++];
+      break;
+    case 2:
+      meanIold-=calib_buff[j++];
+      break;
+    case 3:
+      meanQold-=calib_buff[j++];
+      break;
+    }
+  }
+  //  meanIold/=RXDCLENGTH;
+  //  meanQold/=RXDCLENGTH;
+  printf("[LMS] TX DC (offI): %d => (%d,%d)\n",offIold,meanIold,meanQold);
+
+  offI=-128;
+  lms7->SPI_write(0x0204,(((int16_t)offI)<<7)|offQold);
+
+  for (i=0;i<NUMBUFF;i++) {
+    trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+    trx_lms_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
+  }
+
+  for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+    switch (i&3) {
+    case 0:
+      meanI+=calib_buff[j++];
+      break;
+    case 1:
+      meanQ+=calib_buff[j++];
+      break;
+    case 2:
+      meanI-=calib_buff[j++];
+      break;
+    case 3:
+      meanQ-=calib_buff[j++];
+      break;
+    }
+  }
+  //  meanI/=RXDCLENGTH;
+  //  meanQ/=RXDCLENGTH;
+  printf("[LMS] TX DC (offI): %d => (%d,%d)\n",offI,meanI,meanQ);
+  cnt = 0;
+  while (cnt++ < 8) {
+
+    offInew=(offIold+offI)>>1;
+    if (meanI*meanI+meanQ*meanQ < meanIold*meanIold +meanQold*meanQold) {
+      printf("[LMS] TX DC (offI): ([%d,%d]) => %d : %d\n",offIold,offI,offInew,meanI*meanI+meanQ*meanQ);
+      meanIold = meanI;
+      meanQold = meanQ;
+      offIold = offI;
+    }
+    offI = offInew;
+    lms7->SPI_write(0x0204,(((int16_t)offI)<<7)|offQold);
+
+    for (i=0;i<NUMBUFF;i++) {
+      trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+      trx_lms_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
+    }
+
+    for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+      switch (i&3) {
+      case 0:
+	meanI+=calib_buff[j++];
+	break;
+      case 1:
+	meanQ+=calib_buff[j++];
+	break;
+      case 2:
+	meanI-=calib_buff[j++];
+	break;
+      case 3:
+	meanQ-=calib_buff[j++];
+	break;
+      }
+    }
+    //    meanI/=RXDCLENGTH;
+    //   meanQ/=RXDCLENGTH;
+    //    printf("[LMS] TX DC (offI): %d => (%d,%d)\n",offI,meanI,meanQ);
+  }
+
+
+  if (meanI*meanI+meanQ*meanQ < meanIold*meanIold +meanQold*meanQold) {
+    printf("[LMS] TX DC (offI): ([%d,%d]) => %d : %d\n",offIold,offI,offInew,meanI*meanI+meanQ*meanQ);
+    meanIold = meanI;
+    meanQold = meanQ;
+    offIold = offI;
+  }
+  offQ=-128;
+  lms7->SPI_write(0x0204,(((int16_t)offIold)<<7)|offQ);
+
+  for (i=0;i<NUMBUFF;i++) {
+    trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+    trx_lms_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
+  }
+
+  for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+    switch (i&3) {
+    case 0:
+      meanI+=calib_buff[j++];
+      break;
+    case 1:
+      meanQ+=calib_buff[j++];
+      break;
+    case 2:
+      meanI-=calib_buff[j++];
+      break;
+    case 3:
+      meanQ-=calib_buff[j++];
+      break;
+    }
+  }
+  //  meanI/=RXDCLENGTH;
+  //  meanQ/=RXDCLENGTH;
+  printf("[LMS] TX DC (offQ): %d => (%d,%d)\n",offQ,meanI,meanQ);
+
+  cnt=0;
+  while (cnt++ < 8) {
+
+    offQnew=(offQold+offQ)>>1;
+    if (meanI*meanI+meanQ*meanQ < meanIold*meanIold +meanQold*meanQold) {
+      printf("[LMS] TX DC (offQ): ([%d,%d]) => %d : %d\n",offQold,offQ,offQnew,meanI*meanI+meanQ*meanQ);
+
+      meanIold = meanI;
+      meanQold = meanQ;
+      offQold = offQ;
+    }
+    offQ = offQnew;
+    lms7->SPI_write(0x0204,(((int16_t)offIold)<<7)|offQ);
+
+
+    for (i=0;i<NUMBUFF;i++) {
+      trx_lms_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
+      trx_lms_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
+    }
+
+    for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
+      switch (i&3) {
+      case 0:
+	meanI+=calib_buff[j++];
+	break;
+      case 1:
+	meanQ+=calib_buff[j++];
+	break;
+      case 2:
+	meanI-=calib_buff[j++];
+	break;
+      case 3:
+	meanQ-=calib_buff[j++];
+	break;
+      }
+    }
+    //    meanI/=RXDCLENGTH;
+    //   meanQ/=RXDCLENGTH;
+    //    printf("[LMS] TX DC (offQ): %d => (%d,%d)\n",offQ,meanI,meanQ);
+  }
+
+  LMS_RxStop();
+
+  printf("[LMS] TX DC: (%d,%d) => (%d,%d)\n",offIold,offQold,meanIold,meanQold);
+
+  dccorri = offIold;
+  dccorrq = offQold;
+  
+  
+  lms7->RestoreAllRegisters();
+  lms7->Modify_SPI_Reg_bits(LMS7param(MAC), ch);
+
+  lms7->Modify_SPI_Reg_bits(LMS7param(DCOFFI_RFE), dcoffi);
+  lms7->Modify_SPI_Reg_bits(LMS7param(DCOFFQ_RFE), dcoffq);
+  lms7->Modify_SPI_Reg_bits(LMS7param(DCCORRI_TXTSP), dccorri);
+  lms7->Modify_SPI_Reg_bits(LMS7param(DCCORRQ_TXTSP), dccorrq);
+  //  lms7->Modify_SPI_Reg_bits(LMS7param(GCORRI_TXTSP), gcorri);
+  //  lms7->Modify_SPI_Reg_bits(LMS7param(GCORRQ_TXTSP), gcorrq);
+  //  lms7->Modify_SPI_Reg_bits(LMS7param(IQCORR_TXTSP), iqcorr);
+  
+  //  lms7->Modify_SPI_Reg_bits(LMS7param(DC_BYP_TXTSP), 0); //DC_BYP
+  lms7->Modify_SPI_Reg_bits(0x0208, 1, 0, 0); //GC_BYP PH_BYP
+  
+}
+*/
+
+int trx_lms_set_gains(openair0_device* device, openair0_config_t *openair0_cfg) {
+
+  double gv = openair0_cfg[0].rx_gain[0] - openair0_cfg[0].rx_gain_offset[0];
+
+  if (gv > 31) {
+    printf("RX Gain 0 too high, reduce by %f dB\n",gv-31);
+    gv = 31;
+  }
+  if (gv < 0) {
+    printf("RX Gain 0 too low, increase by %f dB\n",-gv);
+    gv = 0;
+  }
+  printf("[LMS] Setting 7002M G_PGA_RBB to %d\n", (int16_t)gv);
+  lms7->Modify_SPI_Reg_bits(LMS7param(G_PGA_RBB),(int16_t)gv);
+
+  return(0);
+}
+
+int trx_lms_start(openair0_device *device){
+ 
+
+ LMS_Init(0, 128*1024);   
+ usbport = LMS_GetUSBPort();
+ //connect data stream port
+  LMS_UpdateDeviceList(usbport);
+  const char *name = LMS_GetDeviceName(usbport, 0);
+  printf("Connecting to device: %s\n",name);
+
+
+
+  if (LMS_DeviceOpen(usbport, 0)==0)
+  {
+    Si = new Si5351C();
+    lms7 = new LMS7002M(usbport);
+    liblms7_status opStatus;
+
+    printf("Configuring Si5351C\n");
+    Si->Initialize(usbport);
+    Si->SetPLL(0, 25000000, 0);
+    Si->SetPLL(1, 25000000, 0);
+    Si->SetClock(0, 27000000, true, false);
+    Si->SetClock(1, 27000000, true, false);
+    for (int i = 2; i < 8; ++i)
+      Si->SetClock(i, 27000000, false, false);
+    Si5351C::Status status = Si->ConfigureClocks();
+    if (status != Si5351C::SUCCESS)
+      {
+	printf("Failed to configure Si5351C");
+	exit(-1);
+      }
+    status = Si->UploadConfiguration();
+    if (status != Si5351C::SUCCESS)
+      printf("Failed to upload Si5351C configuration");
+    
+
+
+    lms7->ResetChip();
+
+    opStatus = lms7->LoadConfig(device->openair0_cfg[0].configFilename);
+    
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Failed to load configuration file %s\n",device->openair0_cfg[0].configFilename);
+      exit(-1);
+    }
+    opStatus = lms7->UploadAll();
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Failed to upload configuration file\n");
+      exit(-1);
+    }
+
+    // Set TX filter
+    
+    printf("Tuning TX filter\n");
+    opStatus = lms7->TuneTxFilter(LMS7002M::TxFilter::TX_HIGHBAND,device->openair0_cfg[0].tx_bw/1e6);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Warning: Could not tune TX filter to %f MHz\n",device->openair0_cfg[0].tx_bw/1e6);
+    }
+    
+    printf("Tuning RX filter\n");
+    
+    opStatus = lms7->TuneRxFilter(LMS7002M::RxFilter::RX_LPF_LOWBAND,device->openair0_cfg[0].rx_bw/1e6);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Warning: Could not tune RX filter to %f MHz\n",device->openair0_cfg[0].rx_bw/1e6);
+    }
+
+    /*    printf("Tuning TIA filter\n");
+    opStatus = lms7->TuneRxFilter(LMS7002M::RxFilter::RX_TIA,7.0);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Warning: Could not tune RX TIA filter\n");
+      }*/
+
+    opStatus = lms7->SetInterfaceFrequency(lms7->GetFrequencyCGEN_MHz(), 
+					   lms7->Get_SPI_Reg_bits(HBI_OVR_TXTSP), 
+					   lms7->Get_SPI_Reg_bits(HBD_OVR_RXTSP));
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("SetInterfaceFrequency failed: %f,%d,%d\n",
+	     lms7->GetFrequencyCGEN_MHz(), 
+	     lms7->Get_SPI_Reg_bits(HBI_OVR_TXTSP), 
+	     lms7->Get_SPI_Reg_bits(HBD_OVR_RXTSP));
+    }
+    else {
+      printf("SetInterfaceFrequency as %f,%d,%d\n",
+	     lms7->GetFrequencyCGEN_MHz(), 
+	     lms7->Get_SPI_Reg_bits(HBI_OVR_TXTSP), 
+	     lms7->Get_SPI_Reg_bits(HBD_OVR_RXTSP));
+    } 
+    lmsStream = new LMS_StreamBoard(usbport);    
+    LMS_StreamBoard::Status opStreamStatus; 
+    // this will configure that sampling rate at output of FPGA
+    opStreamStatus = lmsStream->ConfigurePLL(usbport,
+					     device->openair0_cfg[0].sample_rate,
+					     device->openair0_cfg[0].sample_rate,90);
+    if (opStatus != LIBLMS7_SUCCESS){
+      printf("Sample rate programming failed\n");
+      exit(-1);
+    }
+
+    opStatus = lms7->SetFrequencySX(LMS7002M::Tx, device->openair0_cfg[0].tx_freq[0]/1e6,30.72);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot set TX frequency %f MHz\n",device->openair0_cfg[0].tx_freq[0]/1e6);
+      exit(-1);
+    }
+    else {
+      printf("Set TX frequency %f MHz\n",device->openair0_cfg[0].tx_freq[0]/1e6);
+    }
+    opStatus = lms7->SetFrequencySX(LMS7002M::Rx, device->openair0_cfg[0].rx_freq[0]/1e6,30.72);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot set RX frequency %f MHz\n",device->openair0_cfg[0].rx_freq[0]/1e6);
+      exit(-1);
+    }
+    else {
+      printf("Set RX frequency %f MHz\n",device->openair0_cfg[0].rx_freq[0]/1e6);
+    }
+
+    trx_lms_set_gains(device, device->openair0_cfg);
+    // Run calibration procedure
+    //    calibrate_rf(device);
+    //lms7->CalibrateTx(5.0);
+    LMS_RxStart();
+  }
+  else
+  {
+   return(-1);
+  }
+  
+ //connect control port 
+
+ /* comport = LMS_GetCOMPort();
+  LMS_UpdateDeviceList(comport);
+  name = LMS_GetDeviceName(comport, 0);
+  if (*name == 0)
+      comport = usbport;  //attempt to use data port 
+  else
+  {
+    printf("Connecting to device: %s\n",name);
+    if (LMS_DeviceOpen(comport, 0)!=0)
+        return (-1);
+  }
+   lms7 = new LMS7002M(comport);
+   if( access( "./config.ini", F_OK ) != -1 ) //load config file
+   lms7->LoadConfig("./config.ini");
+   //calibration takes too long
+   //lms7->CalibrateRx(5.0);  
+   //lms7->CalibrateTx(5.0);
+ */
+
+  return 0;
+}
+
+
+int trx_lms_stop(int card) {
+  /*
+  LMS_DeviceClose(usbport);
+  LMS_DeviceClose(comport);
+  delete lms7;
+  return LMS_Destroy();
+  */
+}
+
+int trx_lms_set_freq(openair0_device* device, openair0_config_t *openair0_cfg,int exmimo_dump_config) {
+  //Control port must be connected 
+   
+  lms7->SetFrequencySX(LMS7002M::Tx,openair0_cfg->tx_freq[0]/1e6,30.72);
+  lms7->SetFrequencySX(LMS7002M::Rx,openair0_cfg->rx_freq[0]/1e6,30.72);
+  printf ("[LMS] rx frequency:%f;\n",openair0_cfg->rx_freq[0]/1e6);
+  set_rx_gain_offset(openair0_cfg,0);
+  return(0);
+    
+}
+
+// 31 = 19 dB => 105 dB total gain @ 2.6 GHz
+rx_gain_calib_table_t calib_table_sodera[] = {
+  {3500000000.0,70.0},
+  {2660000000.0,80.0},
+  {2300000000.0,80.0},
+  {1880000000.0,74.0},  // on W PAD
+  {816000000.0,76.0},   // on W PAD
+  {-1,0}};
+
+
+
+
+
+
+
+int trx_lms_get_stats(openair0_device* device) {
+
+  return(0);
+
+}
+
+int trx_lms_reset_stats(openair0_device* device) {
+
+  return(0);
+
+}
+
+int openair0_set_gains(openair0_device* device, 
+		       openair0_config_t *openair0_cfg) {
+
+  return(0);
+}
+
+int openair0_set_frequencies(openair0_device* device, openair0_config_t *openair0_cfg, int dummy) {
+
+  return(0);
+}
+
+
+
+void trx_lms_end(openair0_device *device) {
+
+
+}
+
+extern "C" {
+/*! \brief Initialize Openair LMSSDR target. It returns 0 if OK
+* \param device the hardware to use
+* \param openair0_cfg RF frontend parameters set by application
+*/
+int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
+
+  device->type=LMSSDR_DEV;
+  printf("LMSSDR: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"));
+
+  switch ((int)openair0_cfg[0].sample_rate) {
+  case 30720000:
+    // from usrp_time_offset
+    openair0_cfg[0].samples_per_packet    = 2048;
+    openair0_cfg[0].tx_sample_advance     = 15;
+    openair0_cfg[0].tx_bw                 = 30.72e6;
+    openair0_cfg[0].rx_bw                 = 30.72e6;
+    openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+    break;
+  case 15360000:
+    openair0_cfg[0].samples_per_packet    = 2048;
+    openair0_cfg[0].tx_sample_advance     = 45;
+    openair0_cfg[0].tx_bw                 = 28e6;
+    openair0_cfg[0].rx_bw                 = 10e6;
+    openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+    break;
+  case 7680000:
+    openair0_cfg[0].samples_per_packet    = 1024;
+    openair0_cfg[0].tx_sample_advance     = 70;
+    openair0_cfg[0].tx_bw                 = 28e6;
+    openair0_cfg[0].rx_bw                 = 5.0e6;
+    openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+    break;
+  case 1920000:
+    openair0_cfg[0].samples_per_packet    = 256;
+    openair0_cfg[0].tx_sample_advance     = 50;
+    openair0_cfg[0].tx_bw                 = 1.25e6;
+    openair0_cfg[0].rx_bw                 = 1.25e6;
+    openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+    break;
+  default:
+    printf("Error: unknown sampling rate %f\n",openair0_cfg[0].sample_rate);
+    exit(-1);
+    break;
+  }
+
+  openair0_cfg[0].rx_gain_calib_table = calib_table_sodera;
+  set_rx_gain_offset(openair0_cfg,0);
+
+  device->Mod_id           = 1;
+  device->trx_start_func   = trx_lms_start;
+  device->trx_write_func   = trx_lms_write;
+  device->trx_read_func    = trx_lms_read;  
+  device->trx_get_stats_func   = trx_lms_get_stats;
+  device->trx_reset_stats_func = trx_lms_reset_stats;
+  device->trx_end_func = trx_lms_end;
+  device->trx_stop_func = trx_lms_stop;
+  device->trx_set_freq_func = trx_lms_set_freq;
+  device->trx_set_gains_func = trx_lms_set_gains;
+  
+  device->openair0_cfg = openair0_cfg;
+
+  return 0;
+}
+}
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..30a2106b340b047c98942b5818bc547930b95166
--- /dev/null
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp
@@ -0,0 +1,723 @@
+/*******************************************************************************
+    OpenAirInterface 
+    Copyright(c) 1999 - 2014 Eurecom
+
+    OpenAirInterface is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+
+    OpenAirInterface is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenAirInterface.The full GNU General Public License is 
+    included in this distribution in the file called "COPYING". If not, 
+    see <http://www.gnu.org/licenses/>.
+
+   Contact Information
+   OpenAirInterface Admin: openair_admin@eurecom.fr
+   OpenAirInterface Tech : openair_tech@eurecom.fr
+   OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
+  
+   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+
+ *******************************************************************************/
+
+/** sodera_lib.c
+ *
+ * Author: Raymond Knopp
+ */
+ 
+#include <vector>
+#include <string>
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+
+
+#include <iostream>
+#include <complex>
+#include <fstream>
+#include <cmath>
+
+#include "common_lib.h"
+
+#include "lmsComms.h"
+#include "LMS7002M.h"
+#include "Si5351C.h"
+#include "LMS_StreamBoard.h"
+
+#ifdef __SSE4_1__
+#  include <smmintrin.h>
+#endif
+ 
+#ifdef __AVX2__
+#  include <immintrin.h>
+#endif
+
+using namespace std;
+
+int num_devices=0;
+/*These items configure the underlying asynch stream used by the the sync interface. 
+ */
+
+#define BUFFERSIZE 4096
+#define BUFFERSCOUNT 32
+typedef struct
+{
+
+  // --------------------------------
+  // variables for SoDeRa configuration
+  // --------------------------------
+
+  LMScomms Port;
+  Si5351C Si;
+  LMS7002M lmsControl;
+  LMS_StreamBoard *lmsStream;
+
+  char buffers_rx[BUFFERSIZE*BUFFERSCOUNT];
+  int handles[BUFFERSCOUNT];
+  int current_handle;
+  int samples_left_buffer;
+
+  double sample_rate;
+  // time offset between transmiter timestamp and receiver timestamp;
+  double tdiff;
+
+  int channelscount;
+  // --------------------------------
+  // Debug and output control
+  // --------------------------------
+  int num_underflows;
+  int num_overflows;
+  int num_seq_errors;
+
+  int64_t tx_count;
+  int64_t rx_count;
+  openair0_timestamp rx_timestamp;
+
+} sodera_t;
+
+typedef struct {
+  uint8_t reserved[8];
+  uint64_t counter;
+  char data[4080];
+} StreamPacket_t;
+
+sodera_t sodera_state;
+
+enum STATUS {
+  SUCCESS,
+  FAILURE
+};
+
+STATUS SPI_write(LMScomms* dataPort, uint16_t address, uint16_t data)
+{
+  assert(dataPort != nullptr);
+  LMScomms::GenericPacket ctrPkt;
+  ctrPkt.cmd = CMD_BRDSPI_WR;
+  ctrPkt.outBuffer.push_back((address >> 8) & 0xFF);
+  ctrPkt.outBuffer.push_back(address & 0xFF);
+  ctrPkt.outBuffer.push_back((data >> 8) & 0xFF);
+  ctrPkt.outBuffer.push_back(data & 0xFF);
+  dataPort->TransferPacket(ctrPkt);
+  return ctrPkt.status == 1 ? SUCCESS : FAILURE;
+}
+
+uint16_t SPI_read(LMScomms* dataPort, uint16_t address)
+{
+  assert(dataPort != nullptr);
+  LMScomms::GenericPacket ctrPkt;
+  ctrPkt.cmd = CMD_BRDSPI_RD;
+  ctrPkt.outBuffer.push_back((address >> 8) & 0xFF);
+  ctrPkt.outBuffer.push_back(address & 0xFF);
+  dataPort->TransferPacket(ctrPkt);
+  if (ctrPkt.inBuffer.size() > 4)
+    return ctrPkt.inBuffer[2] * 256 + ctrPkt.inBuffer[3];
+  else
+    return 0;
+}
+
+static int trx_sodera_start(openair0_device *device)
+{
+  sodera_t *s = (sodera_t*)device->priv;
+
+
+  // init recv and send streaming
+
+  printf("Starting LMS Streaming\n");
+  s->rx_count = 0;
+  s->tx_count = 0;
+  s->rx_timestamp = 0;
+  s->current_handle = 0;
+
+  // switch off RX
+  uint16_t regVal = SPI_read(&s->Port,0x0005);
+  SPI_write(&s->Port,0x0005,regVal & ~0x6);
+
+
+
+
+
+
+  // USB FIFO reset
+  LMScomms::GenericPacket ctrPkt; 
+  ctrPkt.cmd = CMD_USB_FIFO_RST;
+  ctrPkt.outBuffer.push_back(0x01);
+  s->Port.TransferPacket(ctrPkt);
+  ctrPkt.outBuffer[0]=0x00;
+  s->Port.TransferPacket(ctrPkt);
+ 
+  regVal = SPI_read(&s->Port,0x0005);
+  // provide timestamp, set streamTXEN, set TX/RX enable 
+  SPI_write(&s->Port,0x0005,(regVal & ~0x20) | 0x6);
+
+
+  if (s->channelscount==2) {
+    SPI_write(&s->Port,0x0001,0x0003);
+    SPI_write(&s->Port,0x0007,0x000A);
+  }
+  else {
+    SPI_write(&s->Port,0x0001,0x0001);
+    SPI_write(&s->Port,0x0007,0x0008);
+  }
+
+
+  for (int i=0; i< BUFFERSCOUNT ; i++) 
+    s->handles[i] = s->Port.BeginDataReading(&s->buffers_rx[i*BUFFERSIZE],BUFFERSIZE);
+  printf("Armed %d transfers\n",BUFFERSCOUNT);
+  return 0;
+}
+
+static void trx_sodera_end(openair0_device *device)
+{
+  sodera_t *s = (sodera_t*)device->priv;
+
+
+  // stop TX/RX if they were active
+  uint16_t regVal = SPI_read(&s->Port,0x0005);
+  SPI_write(&s->Port,0x0005,regVal & ~0x6);
+
+}
+
+static int trx_sodera_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps, int cc, int flags)
+{
+  sodera_t *s = (sodera_t*)device->priv;
+
+
+  return 0;
+}
+
+#define DEBUG_READ 1
+
+static int trx_sodera_read(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps, int cc)
+{
+   sodera_t *s = (sodera_t*)device->priv;
+   int samples_received=0,i,j;
+   int nsamps2;  // aligned to upper 32 or 16 byte boundary
+   StreamPacket_t *p;
+   int16_t sampleI,sampleQ;
+   char *pktStart;
+   int offset = 0;
+   int num_p;
+   int ind=0;
+   int buffsize;
+   int spp;
+   int bufindex;
+
+   // this assumes that each request is of size 4096 bytes (spp = 4080/4/channelscount)
+   spp = sizeof(p->data)>>2; // spp = size of payload in samples  
+   spp /= s->channelscount;
+
+#ifdef DEBUG_READ
+   printf("\nIn trx_read\n");
+   printf("s->current_handle %d\n", s->current_handle);
+   printf("s->samples_left_buffer %d\n",s->samples_left_buffer);
+#endif
+   // first get rid of remaining samples
+   if (s->samples_left_buffer > 0) {
+     buffsize = min(s->samples_left_buffer,nsamps);
+     pktStart = ((StreamPacket_t*)&s->buffers_rx[s->current_handle*BUFFERSIZE])->data;
+     pktStart += (spp-s->samples_left_buffer);
+     const int stepSize = s->channelscount * 3;
+
+     for (int b=0;b<buffsize<<2;b+=stepSize) {
+       for (int ch=0;ch<s->channelscount;ch++) {
+	 // I sample
+	 sampleI = (pktStart[b + 1 + 3*ch]&0x0F)<<8;
+	 sampleI |= (pktStart[b + 3*ch]&0xFF);
+	 sampleI = (sampleI<<4)>>4;
+	 // Q sample
+	 sampleQ = (pktStart[b + 2 + 3*ch]&0x0F)<<8;
+	 sampleQ |= (pktStart[b + 1 + 3*ch]&0xFF);
+	 sampleQ = (sampleQ<<4)>>4;
+	 ((uint32_t*)buff[ch])[ind] = ((uint32_t)sampleI) | (((uint32_t)sampleQ)<<16);
+       }
+       ind++;
+     }
+   }
+   if (ind == nsamps) {
+     s->samples_left_buffer -= nsamps;
+     s->rx_count += nsamps;
+     *ptimestamp = s->rx_timestamp;
+     s->rx_timestamp+=nsamps;
+      
+     return(nsamps);
+   }
+   else {
+     s->samples_left_buffer = 0;
+     nsamps -= ind;
+     samples_received = ind;
+   }
+
+   // This is for the left-over part => READ from USB
+
+
+
+   num_p = nsamps / spp;
+   if ((nsamps%spp) > 0)
+     num_p++;
+   s->samples_left_buffer = (num_p*spp)-nsamps;
+  
+
+#ifdef DEBUG_READ
+   printf("num_p %d\n",num_p);
+#endif
+   const int stepSize = s->channelscount * 3;
+
+   for (i=0;i<num_p;i++) {
+
+     bufindex = (s->current_handle+i)&(BUFFERSCOUNT-1);
+     if (s->Port.WaitForReading(s->handles[bufindex],1000) == false) {
+       printf("[recv] Error: request %d samples (%d/%d) WaitForReading timed out\n",nsamps,bufindex,num_p);
+       *ptimestamp = s->rx_timestamp;
+       s->rx_timestamp+=samples_received;
+       return(samples_received);
+     }
+     long bytesToRead=BUFFERSIZE;
+     if (s->Port.FinishDataReading(&s->buffers_rx[bufindex*BUFFERSIZE],bytesToRead,s->handles[bufindex]) != BUFFERSIZE) {  
+       printf("[recv] Error: request %d samples (%d/%d) WaitForReading timed out\n",nsamps,bufindex,num_p);
+       *ptimestamp = s->rx_timestamp;
+       s->rx_timestamp+=samples_received;
+       return(samples_received);
+     }
+    
+     p = (StreamPacket_t*)&s->buffers_rx[bufindex*BUFFERSIZE];
+     // handle timestamp
+     if ((i==0) & (ind==0)) { // grab the timestamp from HW
+       *ptimestamp = p->counter;
+       s->rx_timestamp = p->counter+nsamps; // for next time
+#ifdef DEBUG_READ
+       printf("RX timestamp %d\n",s->rx_timestamp);
+#endif
+     }
+     else { // check the timestamp
+       if (i==0) {
+	 if ((s->rx_timestamp + ind) != p->counter) {
+	   printf("Error, RX timestamp error, got %llu, should be %llu\n",p->counter,s->rx_timestamp+ind);
+	   return(ind);
+	 }
+       }
+       *ptimestamp = s->rx_timestamp;
+       s->rx_timestamp+=nsamps;
+     }
+     pktStart = p->data;
+     for (uint16_t b=0;b<sizeof(p->data);b+=stepSize) {
+       for (int ch=0;ch < s->channelscount;ch++) {
+	 // I sample
+	 sampleI = (pktStart[b + 1 + 3*ch]&0x0F)<<8;
+	 sampleI |= (pktStart[b + 3*ch]&0xFF);
+	 sampleI = (sampleI<<4)>>4;
+	 // Q sample
+	 sampleQ = (pktStart[b + 2 + 3*ch]&0x0F)<<8;
+	 sampleQ |= (pktStart[b + 1 + 3*ch]&0xFF);
+	 sampleQ = (sampleQ<<4)>>4;
+	 ((uint32_t*)buff[ch])[ind] = ((uint32_t)sampleI) | (((uint32_t)sampleQ)<<16);
+       }
+       ind++;	        
+     }
+     samples_received+=spp;
+     // schedule a new transmission for this index
+     s->handles[bufindex] = s->Port.BeginDataReading(&s->buffers_rx[bufindex*BUFFERSIZE],BUFFERSIZE);
+     s->current_handle=(s->current_handle+1)&(BUFFERSCOUNT-1);
+   }   
+
+  //handle the error code
+
+  s->rx_count += samples_received;
+  //  s->rx_timestamp = s->rx_md.time_spec.to_ticks(s->sample_rate);
+
+  return samples_received;
+}
+
+
+
+static bool is_equal(double a, double b)
+{
+  return fabs(a-b) < 1e-6;
+}
+
+int trx_sodera_set_freq(openair0_device* device, openair0_config_t *openair0_cfg, int dummy) {
+
+  sodera_t *s = (sodera_t*)device->priv;
+
+  //  s->usrp->set_tx_freq(openair0_cfg[0].tx_freq[0]);
+  //  s->usrp->set_rx_freq(openair0_cfg[0].rx_freq[0]);
+
+  return(0);
+  
+}
+
+int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg) {
+
+  sodera_t *s = (sodera_t*)device->priv;
+  static int first_call=1;
+  static double rf_freq,diff;
+
+  //  uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0]);
+
+  //  rx_tune_req.rf_freq_policy = uhd::tune_request_t::POLICY_MANUAL;
+  //  rx_tune_req.rf_freq = openair0_cfg[0].rx_freq[0];
+  //  rf_freq=openair0_cfg[0].rx_freq[0];
+  //  s->usrp->set_rx_freq(rx_tune_req);
+
+  return(0);
+  
+}
+
+int trx_sodera_set_gains(openair0_device* device, 
+		       openair0_config_t *openair0_cfg) {
+
+  sodera_t *s = (sodera_t*)device->priv;
+
+  //  s->usrp->set_tx_gain(openair0_cfg[0].tx_gain[0]);
+  //  ::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(0);
+  // limit to maximum gain
+  /* if (openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0] > gain_range.stop()) {
+    
+    printf("RX Gain 0 too high, reduce by %f dB\n",
+	   openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0] - gain_range.stop());	   
+    exit(-1);
+  }
+  s->usrp->set_rx_gain(openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0]);
+  printf("Setting SODERA RX gain to %f (rx_gain %f,gain_range.stop() %f)\n", openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0],openair0_cfg[0].rx_gain[0],gain_range.stop());
+  */
+  return(0);
+}
+
+int trx_sodera_stop(int card) {
+  return(0);
+}
+
+
+rx_gain_calib_table_t calib_table_sodera[] = {
+  {3500000000.0,44.0},
+  {2660000000.0,49.0},
+  {2300000000.0,50.0},
+  {1880000000.0,53.0},
+  {816000000.0,58.0},
+  {-1,0}};
+
+void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_gain_adjust) {
+
+  int i=0;
+  // loop through calibration table to find best adjustment factor for RX frequency
+  double min_diff = 6e9,diff,gain_adj=0.0;
+  if (bw_gain_adjust==1) {
+    switch ((int)openair0_cfg[0].sample_rate) {
+    case 30720000:      
+      break;
+    case 23040000:
+      gain_adj=1.25;
+      break;
+    case 15360000:
+      gain_adj=3.0;
+      break;
+    case 7680000:
+      gain_adj=6.0;
+      break;
+    case 3840000:
+      gain_adj=9.0;
+      break;
+    case 1920000:
+      gain_adj=12.0;
+      break;
+    default:
+      printf("unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate);
+      exit(-1);
+      break;
+    }
+  }
+  while (openair0_cfg->rx_gain_calib_table[i].freq>0) {
+    diff = fabs(openair0_cfg->rx_freq[chain_index] - openair0_cfg->rx_gain_calib_table[i].freq);
+    printf("cal %d: freq %f, offset %f, diff %f\n",
+	   i,
+	   openair0_cfg->rx_gain_calib_table[i].freq,
+	   openair0_cfg->rx_gain_calib_table[i].offset,diff);
+    if (min_diff > diff) {
+      min_diff = diff;
+      openair0_cfg->rx_gain_offset[chain_index] = openair0_cfg->rx_gain_calib_table[i].offset+gain_adj;
+    }
+    i++;
+  }
+  
+}
+
+
+int trx_sodera_get_stats(openair0_device* device) {
+
+  return(0);
+
+}
+int trx_sodera_reset_stats(openair0_device* device) {
+
+  return(0);
+
+}
+
+
+int openair0_dev_init_sodera(openair0_device* device, openair0_config_t *openair0_cfg)
+{
+
+  sodera_t *s=&sodera_state;
+
+  size_t i;
+
+  // Initialize SODERA device
+  s->Port.RefreshDeviceList();
+  vector<string> deviceNames=s->Port.GetDeviceList();
+
+  if (deviceNames.size() == 1) {
+    if (s->Port.Open(0) != IConnection::SUCCESS) {
+      printf("Cannot open SoDeRa\n");
+      exit(-1);
+    }
+    LMSinfo devInfo = s->Port.GetInfo();
+    printf("Device %s, HW: %d, FW: %d, Protocol %d\n",
+	   GetDeviceName(devInfo.device),
+	   (int)devInfo.hardware,
+	   (int)devInfo.firmware,
+	   (int)devInfo.protocol);
+    
+    printf("Configuring Si5351C\n");
+    s->Si.Initialize(&s->Port);
+    s->Si.SetPLL(0, 25000000, 0);
+    s->Si.SetPLL(1, 25000000, 0);
+    s->Si.SetClock(0, 27000000, true, false);
+    s->Si.SetClock(1, 27000000, true, false);
+    for (int i = 2; i < 8; ++i)
+      s->Si.SetClock(i, 27000000, false, false);
+    Si5351C::Status status = s->Si.ConfigureClocks();
+    if (status != Si5351C::SUCCESS)
+      {
+	printf("Failed to configure Si5351C");
+	exit(-1);
+      }
+    status = s->Si.UploadConfiguration();
+    if (status != Si5351C::SUCCESS)
+      printf("Failed to upload Si5351C configuration");
+    
+
+    printf("Configuring LMS7002\n");
+    
+    int bw_gain_adjust=0;
+
+   
+    openair0_cfg[0].rx_gain_calib_table = calib_table_sodera;
+
+    switch ((int)openair0_cfg[0].sample_rate) {
+    case 30720000:
+      // from usrp_time_offset
+      openair0_cfg[0].samples_per_packet    = 2048;
+      openair0_cfg[0].tx_sample_advance     = 15;
+      openair0_cfg[0].tx_bw                 = 20e6;
+      openair0_cfg[0].rx_bw                 = 20e6;
+      openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+      break;
+    case 15360000:
+      openair0_cfg[0].samples_per_packet    = 2048;
+      openair0_cfg[0].tx_sample_advance     = 45;
+      openair0_cfg[0].tx_bw                 = 10e6;
+      openair0_cfg[0].rx_bw                 = 10e6;
+      openair0_cfg[0].tx_scheduling_advance = 5*openair0_cfg[0].samples_per_packet;
+      break;
+    case 7680000:
+      openair0_cfg[0].samples_per_packet    = 1024;
+      openair0_cfg[0].tx_sample_advance     = 50;
+      openair0_cfg[0].tx_bw                 = 5e6;
+      openair0_cfg[0].rx_bw                 = 5e6;
+      openair0_cfg[0].tx_scheduling_advance = 5*openair0_cfg[0].samples_per_packet;
+      break;
+    case 1920000:
+      openair0_cfg[0].samples_per_packet    = 256;
+      openair0_cfg[0].tx_sample_advance     = 50;
+      openair0_cfg[0].tx_bw                 = 1.25e6;
+      openair0_cfg[0].rx_bw                 = 1.25e6;
+      openair0_cfg[0].tx_scheduling_advance = 8*openair0_cfg[0].samples_per_packet;
+      break;
+    default:
+      printf("Error: unknown sampling rate %f\n",openair0_cfg[0].sample_rate);
+      exit(-1);
+      break;
+
+    }
+
+    s->lmsControl = LMS7002M(&s->Port);
+
+    liblms7_status opStatus;
+    s->lmsControl.ResetChip();
+    opStatus = s->lmsControl.LoadConfig(openair0_cfg[0].configFilename);
+    
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Failed to load configuration file %s\n",openair0_cfg[0].configFilename);
+      exit(-1);
+    }
+    opStatus = s->lmsControl.UploadAll();
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Failed to upload configuration file\n");
+      exit(-1);
+    }
+    
+    opStatus = s->lmsControl.SetFrequencySX(LMS7002M::Tx, openair0_cfg[0].tx_freq[0]/1e6,30.72);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot set TX frequency %f MHz\n",openair0_cfg[0].tx_freq[0]/1e6);
+      exit(-1);
+    }
+
+    opStatus = s->lmsControl.SetFrequencySX(LMS7002M::Rx, openair0_cfg[0].rx_freq[0]/1e6,30.72);
+
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot set RX frequency %f MHz\n",openair0_cfg[0].rx_freq[0]/1e6);
+      exit(-1);
+    }
+
+
+    
+    // this makes RX/TX sampling rates equal
+    opStatus = s->lmsControl.Modify_SPI_Reg_bits(EN_ADCCLKH_CLKGN,0);
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot modify SPI (EN_ADCCLKH_CLKGN)\n");
+      exit(-1);
+    }
+    opStatus = s->lmsControl.Modify_SPI_Reg_bits(CLKH_OV_CLKL_CGEN,2);
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot modify SPI (CLKH_OV_CLKL_CGEN)\n");
+      exit(-1);
+    }
+
+    const float cgen_freq_MHz = 245.76;
+    const int interpolation   = 0; // real interpolation = 2
+    const int decimation      = 0; // real decimation = 2
+    opStatus = s->lmsControl.SetInterfaceFrequency(cgen_freq_MHz,interpolation,decimation);
+    if (opStatus != LIBLMS7_SUCCESS) {
+      printf("Cannot SetInterfaceFrequency (%f,%d,%d)\n",cgen_freq_MHz,interpolation,decimation);
+      exit(-1);
+    }
+    /*
+    // Run calibration procedure
+    float txrx_calibrationBandwidth_MHz = 5;
+    opStatus = s->lmsControl.CalibrateTx(txrx_calibrationBandwidth_MHz);
+    if (opStatus != LIBLMS7_SUCCESS){
+      printf("TX Calibration failed\n");
+      exit(-1);
+    }
+    opStatus = s->lmsControl.CalibrateRx(txrx_calibrationBandwidth_MHz);
+    if (opStatus != LIBLMS7_SUCCESS){
+      printf("RX Calibration failed\n");
+      exit(-1);
+    }
+    */
+        
+    s->lmsStream = new LMS_StreamBoard(&s->Port);    
+    LMS_StreamBoard::Status opStreamStatus; 
+    // this will configure that sampling rate at output of FPGA
+    opStreamStatus = s->lmsStream->ConfigurePLL(&s->Port,openair0_cfg[0].sample_rate,openair0_cfg[0].sample_rate,90);
+    if (opStatus != LIBLMS7_SUCCESS){
+      printf("Sample rate programming failed\n");
+      exit(-1);
+    }
+    
+    /*
+      ::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(i);
+      // limit to maximum gain
+      if (openair0_cfg[0].rx_gain[i]-openair0_cfg[0].rx_gain_offset[i] > gain_range.stop()) {
+	
+        printf("RX Gain %lu too high, lower by %f dB\n",i,openair0_cfg[0].rx_gain[i]-openair0_cfg[0].rx_gain_offset[i] - gain_range.stop());
+	exit(-1);
+      }
+      s->usrp->set_rx_gain(openair0_cfg[0].rx_gain[i]-openair0_cfg[0].rx_gain_offset[i],i);
+      printf("RX Gain %lu %f (%f) => %f (max %f)\n",i,
+	     openair0_cfg[0].rx_gain[i],openair0_cfg[0].rx_gain_offset[i],
+	     openair0_cfg[0].rx_gain[i]-openair0_cfg[0].rx_gain_offset[i],gain_range.stop());
+    }
+  }
+  for(i=0;i<s->usrp->get_tx_num_channels();i++) {
+    if (i<openair0_cfg[0].tx_num_channels) {
+      s->usrp->set_tx_rate(openair0_cfg[0].sample_rate,i);
+      s->usrp->set_tx_bandwidth(openair0_cfg[0].tx_bw,i);
+      printf("Setting tx freq/gain on channel %lu/%lu: BW %f (readback %f)\n",i,s->usrp->get_tx_num_channels(),openair0_cfg[0].tx_bw/1e6,s->usrp->get_tx_bandwidth(i)/1e6);
+      s->usrp->set_tx_freq(openair0_cfg[0].tx_freq[i],i);
+      s->usrp->set_tx_gain(openair0_cfg[0].tx_gain[i],i);
+    }
+  }
+  */
+
+  // create tx & rx streamer
+
+  //stream_args_rx.args["spp"] = str(boost::format("%d") % 2048);//(openair0_cfg[0].rx_num_channels*openair0_cfg[0].samples_per_packet));
+  
+  /*
+  for (i=0;i<openair0_cfg[0].rx_num_channels;i++) {
+    if (i<openair0_cfg[0].rx_num_channels) {
+      printf("RX Channel %lu\n",i);
+      std::cout << boost::format("Actual RX sample rate: %fMSps...") % (s->usrp->get_rx_rate(i)/1e6) << std::endl;
+      std::cout << boost::format("Actual RX frequency: %fGHz...") % (s->usrp->get_rx_freq(i)/1e9) << std::endl;
+      std::cout << boost::format("Actual RX gain: %f...") % (s->usrp->get_rx_gain(i)) << std::endl;
+      std::cout << boost::format("Actual RX bandwidth: %fM...") % (s->usrp->get_rx_bandwidth(i)/1e6) << std::endl;
+      std::cout << boost::format("Actual RX antenna: %s...") % (s->usrp->get_rx_antenna(i)) << std::endl;
+    }
+  }
+  
+  for (i=0;i<openair0_cfg[0].tx_num_channels;i++) {
+
+    if (i<openair0_cfg[0].tx_num_channels) { 
+      printf("TX Channel %lu\n",i);
+      std::cout << std::endl<<boost::format("Actual TX sample rate: %fMSps...") % (s->usrp->get_tx_rate(i)/1e6) << std::endl;
+      std::cout << boost::format("Actual TX frequency: %fGHz...") % (s->usrp->get_tx_freq(i)/1e9) << std::endl;
+      std::cout << boost::format("Actual TX gain: %f...") % (s->usrp->get_tx_gain(i)) << std::endl;
+      std::cout << boost::format("Actual TX bandwidth: %fM...") % (s->usrp->get_tx_bandwidth(i)/1e6) << std::endl;
+      std::cout << boost::format("Actual TX antenna: %s...") % (s->usrp->get_tx_antenna(i)) << std::endl;
+    }
+  */
+  }
+  else {
+    printf("Please connect SoDeRa\n");
+    exit(-1);
+  }
+
+  device->priv = s;
+  device->trx_start_func = trx_sodera_start;
+  device->trx_write_func = trx_sodera_write;
+  device->trx_read_func  = trx_sodera_read;
+  device->trx_get_stats_func = trx_sodera_get_stats;
+  device->trx_reset_stats_func = trx_sodera_reset_stats;
+  device->trx_end_func   = trx_sodera_end;
+  device->trx_stop_func  = trx_sodera_stop;
+  device->trx_set_freq_func = trx_sodera_set_freq;
+  device->trx_set_gains_func   = trx_sodera_set_gains;
+  
+  s->sample_rate   = openair0_cfg[0].sample_rate;
+  s->channelscount = openair0_cfg[0].rx_num_channels;
+
+  // TODO:
+  return 0;
+}
diff --git a/targets/ARCH/LMSSDR/enb_sodera_highband_10MHz_rx19dB_txfull.ini b/targets/ARCH/LMSSDR/enb_sodera_highband_10MHz_rx19dB_txfull.ini
new file mode 100644
index 0000000000000000000000000000000000000000..e4e420c33435b03ab74cd530465f70c11f20854d
--- /dev/null
+++ b/targets/ARCH/LMSSDR/enb_sodera_highband_10MHz_rx19dB_txfull.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0493=0x0000
+0x0492=0x0000
+0x0491=0x0000
+0x029B=0x0000
+0x048E=0x0000
+0x0022=0x07FF
+0x0283=0x0000
+0x0487=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0480=0x0000
+0x0460=0x0000
+0x0447=0x0000
+0x045A=0x0000
+0x02DA=0x0000
+0x0458=0x0000
+0x0314=0x0000
+0x0456=0x0000
+0x0559=0xACB9
+0x0451=0x0000
+0x0390=0x0000
+0x044B=0x0000
+0x0448=0x0000
+0x0454=0x0000
+0x0446=0x0000
+0x04CA=0x0000
+0x0444=0x0000
+0x0443=0x0000
+0x0508=0xEF99
+0x0441=0x0000
+0x040D=0x0000
+0x040B=0x000F
+0x0409=0x0000
+0x0580=0xEFF2
+0x0407=0x0000
+0x0405=0x0000
+0x0254=0x0000
+0x0404=0x0000
+0x00A0=0x6565
+0x0560=0x174B
+0x0403=0x0013
+0x0402=0x07D9
+0x055E=0xDB10
+0x03A7=0x0000
+0x0520=0x174B
+0x03A5=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x03A2=0x0000
+0x051C=0x0000
+0x048D=0x0000
+0x059A=0x0000
+0x03A1=0x0000
+0x02A2=0x0000
+0x04E1=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x039B=0x0000
+0x0408=0x0000
+0x0398=0x0000
+0x0393=0x0000
+0x0305=0x0000
+0x038E=0x0000
+0x0324=0x0000
+0x02E7=0x0000
+0x038D=0x0000
+0x0387=0x0000
+0x03A0=0x0000
+0x02D0=0x0000
+0x009A=0x658C
+0x054E=0x8184
+0x0386=0x0000
+0x040F=0x43E4
+0x04E3=0x0000
+0x0389=0x0000
+0x054F=0x18C9
+0x0385=0x0000
+0x0315=0x0000
+0x0384=0x0000
+0x0382=0x0000
+0x0288=0x0000
+0x0366=0x0000
+0x0365=0x0000
+0x0364=0x0000
+0x0325=0x0000
+0x0081=0x0000
+0x0362=0x0000
+0x038A=0x0000
+0x035E=0x0000
+0x035D=0x0000
+0x0442=0x0000
+0x0449=0x0000
+0x035A=0x0000
+0x02C8=0x0000
+0x0452=0x0000
+0x0299=0x0000
+0x0359=0x0000
+0x0358=0x0000
+0x048B=0x0000
+0x0354=0x0000
+0x0351=0x0000
+0x03A6=0x0000
+0x0293=0x0000
+0x034E=0x0000
+0x035C=0x0000
+0x034D=0x0000
+0x034B=0x0000
+0x011A=0x2E14
+0x0455=0x0000
+0x034A=0x0000
+0x0348=0x0000
+0x0084=0x0400
+0x0498=0x0000
+0x035B=0x0000
+0x0505=0x00D8
+0x0345=0x0000
+0x0484=0x0000
+0x0586=0x196B
+0x0344=0x0000
+0x0561=0xAB08
+0x0343=0x0000
+0x0342=0x0000
+0x0380=0x0000
+0x0327=0x0000
+0x0322=0x0000
+0x059B=0x0000
+0x0321=0x0000
+0x045E=0x0000
+0x0440=0x0024
+0x031D=0x0000
+0x0363=0x0000
+0x031A=0x0000
+0x031C=0x0000
+0x028F=0x0000
+0x0341=0x0000
+0x0287=0x0000
+0x0318=0x0000
+0x031F=0x0000
+0x0316=0x0000
+0x030D=0x0000
+0x040E=0x0003
+0x0352=0x0000
+0x028C=0x0000
+0x0360=0x0000
+0x0313=0x0000
+0x0461=0x0000
+0x010A=0x104C
+0x051B=0xB77F
+0x0312=0x0000
+0x0346=0x0000
+0x024E=0x0000
+0x0311=0x0000
+0x02D6=0x0000
+0x030C=0x0000
+0x04DF=0x0000
+0x030B=0x0000
+0x0392=0x0000
+0x030A=0x0000
+0x029F=0x0000
+0x0309=0x0000
+0x048A=0x0000
+0x0308=0x0000
+0x0588=0xE6C7
+0x0397=0x0000
+0x02E3=0x0000
+0x049C=0x0000
+0x044A=0x0000
+0x04A4=0x0000
+0x0306=0x0000
+0x0304=0x0000
+0x04D5=0x0000
+0x0303=0x0000
+0x0302=0x0000
+0x0510=0xE6C7
+0x044E=0x0000
+0x0300=0x0000
+0x034F=0x0000
+0x045B=0x0000
+0x02E6=0x0000
+0x00A3=0x6565
+0x04DA=0x0000
+0x025E=0x0000
+0x020A=0x0080
+0x0102=0x3180
+0x020C=0x8000
+0x05A2=0x0000
+0x040A=0x1000
+0x0556=0xA2B5
+0x0243=0x0000
+0x051D=0x4F91
+0x0259=0x0000
+0x02D5=0x0000
+0x02E1=0x0000
+0x011D=0xAAAA
+0x039E=0x0000
+0x0252=0x0000
+0x0204=0xC016
+0x0255=0x0000
+0x0281=0x0000
+0x0200=0x0301
+0x0594=0xF40D
+0x02C5=0x0000
+0x0406=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x0319=0x0000
+0x0121=0x3760
+0x0101=0x7800
+0x025B=0x0000
+0x02C6=0x0000
+0x0558=0x5009
+0x0021=0x0E9F
+0x04C2=0x0000
+0x0290=0x0000
+0x02DF=0x0000
+0x0291=0x0000
+0x0296=0x0000
+0x029C=0x0000
+0x028D=0x0000
+0x02A1=0x0000
+0x008B=0x2756
+0x02A3=0x0000
+0x05A4=0x0000
+0x02A7=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x02C2=0x0000
+0x02C4=0x0000
+0x044D=0x0000
+0x02E2=0x0000
+0x02D1=0x0000
+0x0546=0x8D44
+0x04C8=0x0000
+0x0207=0x0000
+0x04C6=0x0000
+0x0096=0x0000
+0x0093=0x0000
+0x0250=0x0000
+0x02CB=0x0000
+0x02D3=0x0000
+0x0494=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x0251=0x0000
+0x0488=0x0000
+0x0496=0x0000
+0x04C3=0x0000
+0x0100=0x3409
+0x04CC=0x0000
+0x02A5=0x0000
+0x0257=0x0000
+0x04D6=0x0000
+0x04A6=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x0097=0x0000
+0x011E=0x0A2A
+0x0285=0x0000
+0x0280=0x0000
+0x049E=0x0000
+0x0020=0xFFFD
+0x02DD=0x0000
+0x0297=0x0000
+0x049F=0x0000
+0x0522=0xDB10
+0x044C=0x0000
+0x0355=0x0000
+0x04A0=0x0000
+0x02CF=0x0000
+0x04D1=0x0000
+0x0526=0xBE2A
+0x0092=0x0001
+0x031B=0x0000
+0x0541=0x4C24
+0x0518=0xEFF2
+0x0543=0xBD96
+0x02C0=0x0000
+0x0499=0x0000
+0x04A1=0x0000
+0x058D=0xF5EF
+0x02D7=0x0000
+0x0513=0xDAA2
+0x0549=0x18C9
+0x0552=0x8D44
+0x0521=0x5852
+0x0509=0x0605
+0x0286=0x0000
+0x024F=0x0000
+0x04E0=0x0000
+0x0545=0x364E
+0x0349=0x0000
+0x0555=0xBD96
+0x04E4=0x0000
+0x02E4=0x0000
+0x0551=0xD7B7
+0x055D=0xA6B5
+0x0298=0x0000
+0x055F=0x5852
+0x009E=0x658C
+0x0547=0xD7B7
+0x0598=0xF61D
+0x0123=0x067B
+0x0497=0x0000
+0x04A5=0x0000
+0x0565=0xB77F
+0x0124=0x0000
+0x0592=0x0DF1
+0x0591=0xFCFE
+0x0548=0x79FA
+0x04D2=0x0000
+0x0599=0x0000
+0x0511=0x1D10
+0x0506=0x0DF1
+0x0595=0x00BC
+0x0584=0xE7E2
+0x0242=0x0000
+0x025A=0x0000
+0x04E2=0x0000
+0x04C5=0x0000
+0x058C=0xEA50
+0x0450=0x0000
+0x0596=0x0A94
+0x05A7=0x0000
+0x058A=0x17DC
+0x059D=0x0000
+0x0485=0x0000
+0x058E=0x1316
+0x0550=0x79FA
+0x0554=0x6901
+0x0593=0x00D8
+0x0542=0xA2B5
+0x0553=0x364E
+0x0563=0x4F91
+0x024D=0x0000
+0x0567=0x4049
+0x055A=0xBE2A
+0x0295=0x0000
+0x0566=0x0906
+0x028A=0x0000
+0x059C=0x0000
+0x04DD=0x0000
+0x054C=0x7FFF
+0x0582=0x150F
+0x0585=0xDAA2
+0x0109=0x8CC1
+0x04A2=0x0000
+0x0292=0x0000
+0x059F=0x0000
+0x0583=0x2E45
+0x050E=0x17DC
+0x0516=0x150F
+0x0523=0xA6B5
+0x0525=0x57AC
+0x0206=0x0000
+0x051A=0x0906
+0x055C=0x3347
+0x0514=0xE7E2
+0x050F=0xEA5F
+0x05A6=0x0000
+0x051E=0xF524
+0x050A=0x1316
+0x04C7=0x0000
+0x049D=0x0000
+0x0527=0xACB9
+0x050C=0xEA50
+0x0087=0x0000
+0x0399=0x0000
+0x050B=0xF5EF
+0x0507=0xFCFE
+0x010D=0x00DE
+0x04C4=0x0000
+0x0495=0x0000
+0x0246=0x0000
+0x0503=0x00BC
+0x0320=0x0000
+0x0323=0x0000
+0x02E5=0x0000
+0x055B=0x57AC
+0x0114=0x0110
+0x04D8=0x0000
+0x04E7=0x0000
+0x04D0=0x0000
+0x04E6=0x0000
+0x00AE=0x0000
+0x0544=0x6901
+0x0258=0x0000
+0x0502=0x0A94
+0x04DE=0x0000
+0x058B=0x0F45
+0x0028=0x0101
+0x029E=0x0000
+0x04DC=0x0000
+0x04D9=0x0000
+0x0557=0x4C24
+0x058F=0x0605
+0x04DB=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x024C=0x0000
+0x02DC=0x0000
+0x04D4=0x0000
+0x0504=0xF40D
+0x02C3=0x0000
+0x04C1=0x0000
+0x04D3=0x0000
+0x0590=0xEF99
+0x04CE=0x0000
+0x05A5=0x0000
+0x04A7=0x0000
+0x0489=0x0000
+0x02E0=0x0000
+0x0118=0x018C
+0x002A=0x0086
+0x0245=0x0000
+0x045D=0x0000
+0x0581=0xC89D
+0x02D2=0x0000
+0x039C=0x0000
+0x002B=0x4032
+0x02A0=0x0000
+0x010E=0x0285
+0x0394=0x0000
+0x0459=0x0000
+0x0088=0x04F0
+0x0085=0x0001
+0x0089=0x0048
+0x0256=0x0000
+0x0111=0x0099
+0x0095=0x0000
+0x0203=0x2F99
+0x030E=0x0000
+0x0482=0x0000
+0x05A0=0x0000
+0x009C=0x658C
+0x0381=0x0000
+0x0122=0x033F
+0x0110=0x0BFF
+0x0026=0x0101
+0x0294=0x0000
+0x009D=0x6565
+0x0524=0x3347
+0x0106=0x3182
+0x028E=0x0000
+0x0326=0x0000
+0x0113=0x03C3
+0x0391=0x0000
+0x04CB=0x0000
+0x010F=0x3042
+0x0119=0x18DF
+0x02A6=0x0000
+0x05A1=0x0000
+0x02C9=0x0000
+0x0500=0xF61D
+0x039D=0x0000
+0x011F=0x3600
+0x0395=0x0000
+0x024B=0x0000
+0x045C=0x0000
+0x0247=0x0000
+0x0512=0x196B
+0x04E5=0x0000
+0x0024=0x50D8
+0x0353=0x0000
+0x050D=0x0F45
+0x02CD=0x0000
+0x0490=0x0000
+0x0501=0xFDFB
+0x034C=0x0000
+0x00AA=0x0000
+0x0350=0x0000
+0x0445=0x0000
+0x048F=0x0000
+0x008A=0x0491
+0x0453=0x0000
+0x0260=0x0000
+0x00A1=0x6565
+0x0356=0x0000
+0x0241=0x0000
+0x008C=0x267B
+0x038F=0x0000
+0x054A=0x8184
+0x00A4=0x6565
+0x0401=0x07FF
+0x04CD=0x0000
+0x0249=0x0000
+0x002C=0x0000
+0x054D=0xF7A3
+0x00A6=0x0001
+0x002D=0xFFFF
+0x00AC=0x2000
+0x0253=0x0000
+0x028B=0x0000
+0x040C=0x40F8
+0x0310=0x0000
+0x0099=0x6565
+0x00A2=0x6565
+0x0589=0xEA5F
+0x002F=0x3840
+0x035F=0x0000
+0x0597=0xFDFB
+0x0116=0x8180
+0x02CC=0x0000
+0x0025=0x0101
+0x0562=0xF524
+0x011C=0xA941
+0x0289=0x0000
+0x0282=0x0000
+0x0307=0x0000
+0x038C=0x0000
+0x02C7=0x0000
+0x054B=0xF7A3
+0x0519=0x4049
+0x009F=0x658C
+0x025C=0x0000
+0x0515=0x2E45
+0x00A5=0x6565
+0x0301=0x0000
+0x02C1=0x0000
+0x0481=0x0000
+0x0517=0xC89D
+0x00A8=0x0000
+0x0564=0x0000
+0x00AB=0x0040
+0x0261=0x0000
+0x002E=0x0000
+0x02DE=0x0000
+0x02A4=0x0000
+0x0540=0x5009
+0x00AD=0x03FF
+0x0029=0x0101
+0x024A=0x0000
+0x00A7=0x6565
+0x0027=0x05E4
+0x0117=0x100C
+0x0098=0x0000
+0x0108=0xFC26
+0x020B=0x4000
+0x0383=0x0000
+0x0202=0x0794
+0x0086=0x4101
+0x010C=0x8865
+0x02D8=0x0000
+0x0347=0x0000
+0x0457=0x0000
+0x0103=0x0612
+0x0104=0x0088
+0x0357=0x0000
+0x02DB=0x0000
+0x0400=0x0101
+0x009B=0x6565
+0x0105=0x0007
+0x05A3=0x0000
+0x0240=0x0028
+0x0367=0x0000
+0x044F=0x0000
+0x038B=0x0000
+0x02D9=0x0000
+0x02CE=0x0000
+0x0284=0x0000
+0x0396=0x0000
+0x029A=0x0000
+0x051F=0xAB08
+0x0361=0x0000
+0x0205=0x0000
+0x031E=0x0000
+0x04C0=0x0000
+0x0587=0x1D10
+0x0023=0x5550
+0x048C=0x0000
+0x0112=0x3171
+0x039A=0x0000
+0x0115=0x0009
+0x00A9=0x8000
+0x0317=0x0000
+0x0244=0x0000
+0x0094=0x0000
+0x0340=0x0000
+0x0208=0x0170
+0x04A3=0x0000
+0x029D=0x0000
+0x0388=0x0000
+0x0120=0xB9FF
+0x04C9=0x0000
+0x02CA=0x0000
+0x0209=0x0000
+0x0082=0x8001
+0x02D4=0x0000
+0x0107=0x318C
+[lms7002_registers_b]
+0x04E1=0x0000
+0x03A1=0x0000
+0x02A2=0x0000
+0x04E0=0x0000
+0x04DE=0x0000
+0x058B=0x0000
+0x04DC=0x0000
+0x04DB=0x0000
+0x04D9=0x0000
+0x04D5=0x0000
+0x0304=0x0000
+0x04D4=0x0000
+0x0504=0x0000
+0x04D3=0x0000
+0x04D2=0x0000
+0x0548=0x0000
+0x04D0=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x04CE=0x0000
+0x04CC=0x0000
+0x02A5=0x0000
+0x04C6=0x0000
+0x0207=0x0000
+0x04C1=0x0000
+0x02C3=0x0000
+0x04C9=0x0000
+0x02CA=0x0000
+0x04C0=0x0000
+0x031E=0x0000
+0x04D6=0x0000
+0x0257=0x0000
+0x04A6=0x0000
+0x04A5=0x0000
+0x04A2=0x0000
+0x0109=0x61C1
+0x049D=0x0000
+0x04C7=0x0000
+0x049C=0x0000
+0x0397=0x0000
+0x02E3=0x0000
+0x0499=0x0000
+0x02C0=0x0000
+0x0496=0x0000
+0x04C3=0x0000
+0x0493=0x0000
+0x04A1=0x0000
+0x0492=0x0000
+0x0491=0x0000
+0x029B=0x0000
+0x048E=0x0000
+0x0283=0x0000
+0x048C=0x0000
+0x048B=0x0000
+0x0358=0x0000
+0x0487=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0480=0x0000
+0x0460=0x0000
+0x0447=0x0000
+0x045A=0x0000
+0x02DA=0x0000
+0x0458=0x0000
+0x0314=0x0000
+0x0456=0x0000
+0x0559=0x0000
+0x0453=0x0000
+0x0451=0x0000
+0x0390=0x0000
+0x044D=0x0000
+0x02E2=0x0000
+0x044B=0x0000
+0x0448=0x0000
+0x0454=0x0000
+0x0446=0x0000
+0x04CA=0x0000
+0x0444=0x0000
+0x0443=0x0000
+0x0508=0x0000
+0x0441=0x0000
+0x040D=0x0000
+0x040B=0x7FFF
+0x0409=0x0000
+0x0580=0x0000
+0x0407=0x0000
+0x0405=0x0000
+0x0254=0x0000
+0x0404=0x0000
+0x0560=0x0000
+0x04D8=0x0000
+0x0403=0x0000
+0x0402=0x07FF
+0x055E=0x0000
+0x03A7=0x0000
+0x0520=0x0000
+0x03A5=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x03A2=0x0000
+0x051C=0x0000
+0x048D=0x0000
+0x059A=0x0000
+0x049E=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x039B=0x0000
+0x0399=0x0000
+0x0408=0x0000
+0x0398=0x0000
+0x0497=0x0000
+0x0123=0x267B
+0x0394=0x0000
+0x0459=0x0000
+0x0393=0x0000
+0x0305=0x0000
+0x038E=0x0000
+0x0324=0x0000
+0x02E7=0x0000
+0x038D=0x0000
+0x0395=0x0000
+0x038A=0x0000
+0x0362=0x0000
+0x0387=0x0000
+0x0200=0x0081
+0x0594=0x0000
+0x02C5=0x0000
+0x02A7=0x0000
+0x0318=0x0000
+0x0544=0x0000
+0x049A=0x0000
+0x0388=0x0000
+0x0120=0xB9FF
+0x020A=0x0080
+0x0102=0x3180
+0x0290=0x0000
+0x02DF=0x0000
+0x0291=0x0000
+0x0295=0x0000
+0x055A=0x0000
+0x029C=0x0000
+0x010E=0x2040
+0x02A0=0x0000
+0x010F=0x3042
+0x02A6=0x0000
+0x0119=0x18CB
+0x02D2=0x0000
+0x039C=0x0000
+0x028D=0x0000
+0x02A1=0x0000
+0x02C2=0x0000
+0x045E=0x0000
+0x031D=0x0000
+0x0440=0x0020
+0x02C4=0x0000
+0x04D1=0x0000
+0x02CF=0x0000
+0x02C1=0x0000
+0x02C7=0x0000
+0x054B=0x0000
+0x02D3=0x0000
+0x04C8=0x0000
+0x02D1=0x0000
+0x0546=0x0000
+0x0306=0x0000
+0x02D7=0x0000
+0x058D=0x0000
+0x0457=0x0000
+0x02D8=0x0000
+0x0347=0x0000
+0x0103=0x0A12
+0x0104=0x0088
+0x0357=0x0000
+0x02DB=0x0000
+0x0400=0x0081
+0x0209=0x0000
+0x0297=0x0000
+0x02DD=0x0000
+0x029E=0x0000
+0x02DE=0x0000
+0x0527=0x0000
+0x02D5=0x0000
+0x02E1=0x0000
+0x0259=0x0000
+0x0481=0x0000
+0x0517=0x0000
+0x029A=0x0000
+0x051F=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x0507=0x0000
+0x0321=0x0000
+0x034F=0x0000
+0x0296=0x0000
+0x0510=0x0000
+0x0302=0x0000
+0x038C=0x0000
+0x0307=0x0000
+0x0282=0x0000
+0x0392=0x0000
+0x030B=0x0000
+0x0588=0x0000
+0x0308=0x0000
+0x048A=0x0000
+0x044A=0x0000
+0x04A4=0x0000
+0x04C4=0x0000
+0x010D=0x009E
+0x0300=0x0000
+0x0587=0x0000
+0x044E=0x0000
+0x0309=0x0000
+0x0585=0x0000
+0x02E5=0x0000
+0x055B=0x0000
+0x0114=0x008D
+0x0323=0x0000
+0x0320=0x0000
+0x0503=0x0000
+0x0513=0x0000
+0x0319=0x0000
+0x0260=0x0000
+0x0549=0x0000
+0x0552=0x0000
+0x0509=0x0000
+0x0521=0x0000
+0x0286=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x0557=0x0000
+0x058F=0x0000
+0x0322=0x0000
+0x059B=0x0000
+0x0545=0x0000
+0x0349=0x0000
+0x0555=0x0000
+0x02E4=0x0000
+0x04E4=0x0000
+0x0551=0x0000
+0x0312=0x0000
+0x055D=0x0000
+0x0298=0x0000
+0x055F=0x0000
+0x011D=0xAAAA
+0x039E=0x0000
+0x0547=0x0000
+0x0598=0x0000
+0x0449=0x0000
+0x0564=0x0000
+0x0242=0x0000
+0x0525=0x0000
+0x0523=0x0000
+0x0565=0x0000
+0x0124=0x0000
+0x0592=0x0000
+0x0591=0x0000
+0x0563=0x0000
+0x024D=0x0000
+0x0567=0x0000
+0x05A5=0x0000
+0x0566=0x0000
+0x030A=0x0000
+0x029F=0x0000
+0x054C=0x0000
+0x0582=0x0000
+0x0599=0x0000
+0x0511=0x0000
+0x0506=0x0000
+0x0301=0x0000
+0x0595=0x0000
+0x0584=0x0000
+0x058C=0x0000
+0x051E=0x0000
+0x05A6=0x0000
+0x050F=0x0000
+0x0590=0x0000
+0x05A0=0x0000
+0x0596=0x0000
+0x05A7=0x0000
+0x0562=0x0000
+0x058A=0x0000
+0x059D=0x0000
+0x0485=0x0000
+0x0581=0x0000
+0x045D=0x0000
+0x0245=0x0000
+0x0310=0x0000
+0x058E=0x0000
+0x05A2=0x0000
+0x054D=0x0000
+0x020C=0x7FFF
+0x0589=0x0000
+0x0522=0x0000
+0x049F=0x0000
+0x031F=0x0000
+0x0292=0x0000
+0x059F=0x0000
+0x0583=0x0000
+0x0543=0x0000
+0x0317=0x0000
+0x0244=0x0000
+0x0554=0x0000
+0x0593=0x0000
+0x05A4=0x0000
+0x02A3=0x0000
+0x0553=0x0000
+0x0542=0x0000
+0x0519=0x0000
+0x024F=0x0000
+0x0524=0x0000
+0x0518=0x0000
+0x0354=0x0000
+0x0526=0x0000
+0x031B=0x0000
+0x050E=0x0000
+0x0516=0x0000
+0x02CB=0x0000
+0x0250=0x0000
+0x031C=0x0000
+0x028F=0x0000
+0x051A=0x0000
+0x055C=0x0000
+0x0514=0x0000
+0x050A=0x0000
+0x050C=0x0000
+0x050B=0x0000
+0x04E7=0x0000
+0x04E6=0x0000
+0x04E5=0x0000
+0x0512=0x0000
+0x0206=0x0000
+0x0550=0x0000
+0x0360=0x0000
+0x030E=0x0000
+0x0203=0x0000
+0x0482=0x0000
+0x0541=0x0000
+0x0122=0x033F
+0x0110=0x0BF4
+0x0204=0x0000
+0x0252=0x0000
+0x011E=0x0AA7
+0x049B=0x0000
+0x0294=0x0000
+0x011C=0xA941
+0x02D6=0x0000
+0x0311=0x0000
+0x0117=0x280C
+0x02A4=0x0000
+0x0540=0x0000
+0x02E0=0x0000
+0x0118=0x018C
+0x0489=0x0000
+0x04A7=0x0000
+0x0101=0x7800
+0x0558=0x0000
+0x02C6=0x0000
+0x05A1=0x0000
+0x02C9=0x0000
+0x039D=0x0000
+0x0500=0x0000
+0x0450=0x0000
+0x011F=0x3600
+0x030C=0x0000
+0x04DF=0x0000
+0x0281=0x0000
+0x0106=0x3182
+0x028E=0x0000
+0x0326=0x0000
+0x0113=0x03C3
+0x04CB=0x0000
+0x0391=0x0000
+0x0105=0x0007
+0x02D9=0x0000
+0x02CE=0x0000
+0x038B=0x0000
+0x044F=0x0000
+0x02D4=0x0000
+0x0107=0x318C
+0x0495=0x0000
+0x0246=0x0000
+0x0303=0x0000
+0x02E6=0x0000
+0x045B=0x0000
+0x0100=0x3409
+0x0340=0x0000
+0x0208=0x0070
+0x0111=0x0083
+0x0247=0x0000
+0x024B=0x0000
+0x045C=0x0000
+0x0383=0x0000
+0x0202=0x07FF
+0x054A=0x0000
+0x0401=0x07FF
+0x0341=0x0000
+0x0287=0x0000
+0x034C=0x0000
+0x0501=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x0406=0x0000
+0x0313=0x0000
+0x010A=0x104C
+0x0461=0x0000
+0x051B=0x0000
+0x0121=0x31FA
+0x0115=0x0009
+0x0112=0xC0E6
+0x039A=0x0000
+0x02CC=0x0000
+0x0116=0x8180
+0x04A0=0x0000
+0x0108=0x9442
+0x020B=0x4000
+0x0251=0x0000
+0x0488=0x0000
+0x0241=0x0000
+0x038F=0x0000
+0x02DC=0x0000
+0x024C=0x0000
+0x0494=0x0000
+0x051D=0x0000
+0x0243=0x0000
+0x0556=0x0000
+0x040A=0x0000
+0x04CD=0x0000
+0x0249=0x0000
+0x0261=0x0000
+0x024A=0x0000
+0x0285=0x0000
+0x0280=0x0000
+0x0346=0x0000
+0x024E=0x0000
+0x0253=0x0000
+0x028B=0x0000
+0x040C=0x0000
+0x0255=0x0000
+0x0258=0x0000
+0x0502=0x0000
+0x05A3=0x0000
+0x0367=0x0000
+0x0240=0x0020
+0x0256=0x0000
+0x025A=0x0000
+0x04E2=0x0000
+0x04C5=0x0000
+0x025B=0x0000
+0x0205=0x0000
+0x0361=0x0000
+0x0515=0x0000
+0x025C=0x0000
+0x0355=0x0000
+0x044C=0x0000
+0x010C=0x88FD
+0x0284=0x0000
+0x0396=0x0000
+0x0363=0x0000
+0x031A=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x04DD=0x0000
+0x059C=0x0000
+0x0352=0x0000
+0x028C=0x0000
+0x04C2=0x0000
+0x04DA=0x0000
+0x025E=0x0000
+0x0327=0x0000
+0x0380=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0561=0x0000
+0x035A=0x0000
+0x02C8=0x0000
+0x0484=0x0000
+0x0586=0x0000
+0x0597=0x0000
+0x035F=0x0000
+0x0345=0x0000
+0x0505=0x0000
+0x035B=0x0000
+0x034A=0x0000
+0x0455=0x0000
+0x011A=0x2E02
+0x034B=0x0000
+0x034D=0x0000
+0x035C=0x0000
+0x034E=0x0000
+0x0293=0x0000
+0x03A6=0x0000
+0x0350=0x0000
+0x0445=0x0000
+0x048F=0x0000
+0x0351=0x0000
+0x0353=0x0000
+0x050D=0x0000
+0x02CD=0x0000
+0x0490=0x0000
+0x0498=0x0000
+0x0348=0x0000
+0x0356=0x0000
+0x030D=0x0000
+0x0316=0x0000
+0x040E=0x0000
+0x04A3=0x0000
+0x029D=0x0000
+0x0359=0x0000
+0x0299=0x0000
+0x0452=0x0000
+0x0442=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x0325=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0381=0x0000
+0x0288=0x0000
+0x0382=0x0000
+0x0384=0x0000
+0x0315=0x0000
+0x0385=0x0000
+0x04E3=0x0000
+0x040F=0x0000
+0x0389=0x0000
+0x054F=0x0000
+0x0386=0x0000
+0x02D0=0x0000
+0x054E=0x0000
+0x03A0=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/LMSSDR/enb_sodera_highband_5MHz_rx19dB_txfull.ini b/targets/ARCH/LMSSDR/enb_sodera_highband_5MHz_rx19dB_txfull.ini
new file mode 100644
index 0000000000000000000000000000000000000000..a3c1aa2e6f40fb1bd38e3fb22aa5706905ec8724
--- /dev/null
+++ b/targets/ARCH/LMSSDR/enb_sodera_highband_5MHz_rx19dB_txfull.ini
@@ -0,0 +1,1128 @@
+[reference_clocks]
+sxr_ref_clk_mhz=30.72
+sxt_ref_clk_mhz=30.72
+[lms7002_registers_b]
+0x03A0=0x0000
+0x054E=0x0000
+0x02D0=0x0000
+0x0386=0x0000
+0x054F=0x0000
+0x0389=0x0000
+0x040F=0x0000
+0x04E3=0x0000
+0x0385=0x0000
+0x0315=0x0000
+0x0384=0x0000
+0x0382=0x0000
+0x0288=0x0000
+0x0381=0x0000
+0x0366=0x0000
+0x0365=0x0000
+0x0364=0x0000
+0x0325=0x0000
+0x035E=0x0000
+0x035D=0x0000
+0x0442=0x0000
+0x0452=0x0000
+0x0299=0x0000
+0x0359=0x0000
+0x029D=0x0000
+0x04A3=0x0000
+0x040E=0x0000
+0x0316=0x0000
+0x030D=0x0000
+0x0356=0x0000
+0x0348=0x0000
+0x0498=0x0000
+0x0490=0x0000
+0x02CD=0x0000
+0x050D=0x0000
+0x0353=0x0000
+0x0351=0x0000
+0x048F=0x0000
+0x0445=0x0000
+0x0350=0x0000
+0x03A6=0x0000
+0x0293=0x0000
+0x034E=0x0000
+0x035C=0x0000
+0x034D=0x0000
+0x034B=0x0000
+0x011A=0x2E02
+0x0455=0x0000
+0x034A=0x0000
+0x035B=0x0000
+0x0505=0x0000
+0x0345=0x0000
+0x035F=0x0000
+0x0597=0x0000
+0x0586=0x0000
+0x0484=0x0000
+0x02C8=0x0000
+0x035A=0x0000
+0x0561=0x0000
+0x0344=0x0000
+0x0343=0x0000
+0x0342=0x0000
+0x0380=0x0000
+0x0327=0x0000
+0x025E=0x0000
+0x04DA=0x0000
+0x04C2=0x0000
+0x028C=0x0000
+0x0352=0x0000
+0x059C=0x0000
+0x04DD=0x0000
+0x028A=0x0000
+0x0289=0x0000
+0x031A=0x0000
+0x0363=0x0000
+0x0396=0x0000
+0x0284=0x0000
+0x010C=0x88FD
+0x044C=0x0000
+0x0355=0x0000
+0x025C=0x0000
+0x0515=0x0000
+0x0361=0x0000
+0x0205=0x0000
+0x025B=0x0000
+0x04C5=0x0000
+0x04E2=0x0000
+0x025A=0x0000
+0x0256=0x0000
+0x0240=0x0020
+0x0367=0x0000
+0x05A3=0x0000
+0x0502=0x0000
+0x0258=0x0000
+0x0255=0x0000
+0x040C=0x0000
+0x028B=0x0000
+0x0253=0x0000
+0x024E=0x0000
+0x0346=0x0000
+0x0280=0x0000
+0x0285=0x0000
+0x024A=0x0000
+0x0261=0x0000
+0x0249=0x0000
+0x04CD=0x0000
+0x040A=0x0000
+0x0556=0x0000
+0x0243=0x0000
+0x051D=0x0000
+0x0494=0x0000
+0x024C=0x0000
+0x02DC=0x0000
+0x038F=0x0000
+0x0241=0x0000
+0x0488=0x0000
+0x0251=0x0000
+0x020B=0x4000
+0x0108=0x9442
+0x04A0=0x0000
+0x0116=0x8180
+0x02CC=0x0000
+0x039A=0x0000
+0x0112=0xC0E6
+0x0307=0x0000
+0x038C=0x0000
+0x0282=0x0000
+0x0321=0x0000
+0x0507=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x02E1=0x0000
+0x0517=0x0000
+0x0481=0x0000
+0x02D5=0x0000
+0x0259=0x0000
+0x0527=0x0000
+0x02DD=0x0000
+0x0209=0x0000
+0x0297=0x0000
+0x0400=0x0081
+0x0104=0x0088
+0x0103=0x0A12
+0x0347=0x0000
+0x02D8=0x0000
+0x0457=0x0000
+0x0306=0x0000
+0x02D1=0x0000
+0x04C8=0x0000
+0x0546=0x0000
+0x0440=0x0020
+0x045E=0x0000
+0x031D=0x0000
+0x039C=0x0000
+0x02D2=0x0000
+0x010E=0x2040
+0x02A0=0x0000
+0x0544=0x0000
+0x029C=0x0000
+0x055A=0x0000
+0x0295=0x0000
+0x02CF=0x0000
+0x04D1=0x0000
+0x0291=0x0000
+0x02DF=0x0000
+0x0290=0x0000
+0x020A=0x0080
+0x0102=0x3180
+0x0120=0xB9FF
+0x0388=0x0000
+0x0318=0x0000
+0x02A7=0x0000
+0x0200=0x0081
+0x0594=0x0000
+0x02C5=0x0000
+0x028D=0x0000
+0x02A1=0x0000
+0x0362=0x0000
+0x038A=0x0000
+0x0395=0x0000
+0x058D=0x0000
+0x02D7=0x0000
+0x0305=0x0000
+0x0393=0x0000
+0x0398=0x0000
+0x0408=0x0000
+0x039B=0x0000
+0x049E=0x0000
+0x02DB=0x0000
+0x0357=0x0000
+0x02C2=0x0000
+0x0514=0x0000
+0x051C=0x0000
+0x03A2=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x0493=0x0000
+0x0454=0x0000
+0x0448=0x0000
+0x0397=0x0000
+0x02E3=0x0000
+0x049C=0x0000
+0x040D=0x0000
+0x0281=0x0000
+0x048C=0x0000
+0x049A=0x0000
+0x0119=0x18CB
+0x010F=0x3042
+0x02A6=0x0000
+0x0257=0x0000
+0x04D6=0x0000
+0x04A6=0x0000
+0x0324=0x0000
+0x038E=0x0000
+0x02E7=0x0000
+0x034F=0x0000
+0x04E0=0x0000
+0x0123=0x267B
+0x0497=0x0000
+0x0459=0x0000
+0x0394=0x0000
+0x04A5=0x0000
+0x04D9=0x0000
+0x0304=0x0000
+0x04D5=0x0000
+0x0508=0x0000
+0x0443=0x0000
+0x0301=0x0000
+0x0548=0x0000
+0x04D2=0x0000
+0x0592=0x0000
+0x0591=0x0000
+0x04C7=0x0000
+0x049D=0x0000
+0x029A=0x0000
+0x051F=0x0000
+0x0309=0x0000
+0x0585=0x0000
+0x03A5=0x0000
+0x02D3=0x0000
+0x0451=0x0000
+0x0390=0x0000
+0x0562=0x0000
+0x02C4=0x0000
+0x029E=0x0000
+0x031E=0x0000
+0x04C0=0x0000
+0x04DC=0x0000
+0x04DE=0x0000
+0x058B=0x0000
+0x04DB=0x0000
+0x04D0=0x0000
+0x0492=0x0000
+0x04A1=0x0000
+0x054B=0x0000
+0x02C7=0x0000
+0x05A0=0x0000
+0x044B=0x0000
+0x0100=0x3409
+0x04CA=0x0000
+0x0446=0x0000
+0x02E4=0x0000
+0x04E4=0x0000
+0x04C3=0x0000
+0x0496=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x04D4=0x0000
+0x0504=0x0000
+0x04CE=0x0000
+0x02DE=0x0000
+0x0399=0x0000
+0x050C=0x0000
+0x02A5=0x0000
+0x04CC=0x0000
+0x03A1=0x0000
+0x04E1=0x0000
+0x02A2=0x0000
+0x040B=0x7FFF
+0x0283=0x0000
+0x048E=0x0000
+0x0580=0x0000
+0x0409=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x048B=0x0000
+0x0358=0x0000
+0x0589=0x0000
+0x038D=0x0000
+0x0487=0x0000
+0x0510=0x0000
+0x0302=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0480=0x0000
+0x0567=0x0000
+0x02DA=0x0000
+0x045A=0x0000
+0x0254=0x0000
+0x0405=0x0000
+0x0387=0x0000
+0x0458=0x0000
+0x0314=0x0000
+0x0360=0x0000
+0x0559=0x0000
+0x0456=0x0000
+0x0453=0x0000
+0x02E2=0x0000
+0x044D=0x0000
+0x0441=0x0000
+0x02C3=0x0000
+0x04C1=0x0000
+0x04D3=0x0000
+0x0444=0x0000
+0x0207=0x0000
+0x04C6=0x0000
+0x0296=0x0000
+0x0555=0x0000
+0x0349=0x0000
+0x0109=0x61C1
+0x04A2=0x0000
+0x0447=0x0000
+0x0460=0x0000
+0x048D=0x0000
+0x059A=0x0000
+0x0407=0x0000
+0x02C0=0x0000
+0x0499=0x0000
+0x0543=0x0000
+0x04C9=0x0000
+0x02CA=0x0000
+0x0404=0x0000
+0x0560=0x0000
+0x02C1=0x0000
+0x04D8=0x0000
+0x0403=0x0000
+0x0491=0x0000
+0x029B=0x0000
+0x04C4=0x0000
+0x010D=0x009E
+0x0402=0x07FF
+0x055E=0x0000
+0x03A7=0x0000
+0x0520=0x0000
+0x0392=0x0000
+0x030B=0x0000
+0x0588=0x0000
+0x0308=0x0000
+0x048A=0x0000
+0x044A=0x0000
+0x04A4=0x0000
+0x0300=0x0000
+0x0587=0x0000
+0x044E=0x0000
+0x055B=0x0000
+0x02E5=0x0000
+0x0114=0x008D
+0x0323=0x0000
+0x0320=0x0000
+0x0503=0x0000
+0x0513=0x0000
+0x0319=0x0000
+0x0260=0x0000
+0x0549=0x0000
+0x0552=0x0000
+0x0509=0x0000
+0x0521=0x0000
+0x0286=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x058F=0x0000
+0x0557=0x0000
+0x0322=0x0000
+0x059B=0x0000
+0x049F=0x0000
+0x0522=0x0000
+0x0545=0x0000
+0x0551=0x0000
+0x0312=0x0000
+0x055D=0x0000
+0x0298=0x0000
+0x055F=0x0000
+0x011D=0xAAAA
+0x039E=0x0000
+0x0547=0x0000
+0x0598=0x0000
+0x0449=0x0000
+0x0564=0x0000
+0x0242=0x0000
+0x0525=0x0000
+0x0523=0x0000
+0x0565=0x0000
+0x0124=0x0000
+0x0563=0x0000
+0x024D=0x0000
+0x05A5=0x0000
+0x0566=0x0000
+0x030A=0x0000
+0x029F=0x0000
+0x054C=0x0000
+0x0582=0x0000
+0x0599=0x0000
+0x0511=0x0000
+0x0506=0x0000
+0x0595=0x0000
+0x0584=0x0000
+0x058C=0x0000
+0x05A6=0x0000
+0x051E=0x0000
+0x050F=0x0000
+0x0590=0x0000
+0x0596=0x0000
+0x05A7=0x0000
+0x058A=0x0000
+0x059D=0x0000
+0x0485=0x0000
+0x0581=0x0000
+0x045D=0x0000
+0x0245=0x0000
+0x0310=0x0000
+0x058E=0x0000
+0x05A2=0x0000
+0x054D=0x0000
+0x020C=0x7FFF
+0x031F=0x0000
+0x0292=0x0000
+0x059F=0x0000
+0x0583=0x0000
+0x0317=0x0000
+0x0244=0x0000
+0x0554=0x0000
+0x0593=0x0000
+0x05A4=0x0000
+0x02A3=0x0000
+0x0553=0x0000
+0x0542=0x0000
+0x0519=0x0000
+0x024F=0x0000
+0x0524=0x0000
+0x0518=0x0000
+0x0354=0x0000
+0x0526=0x0000
+0x031B=0x0000
+0x050E=0x0000
+0x0516=0x0000
+0x02CB=0x0000
+0x0250=0x0000
+0x031C=0x0000
+0x028F=0x0000
+0x051A=0x0000
+0x055C=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x04E7=0x0000
+0x04E6=0x0000
+0x04E5=0x0000
+0x0512=0x0000
+0x0206=0x0000
+0x0550=0x0000
+0x030E=0x0000
+0x0203=0x0000
+0x0482=0x0000
+0x0541=0x0000
+0x0122=0x033F
+0x0110=0x0BF4
+0x0204=0x0000
+0x0252=0x0000
+0x011E=0x0AA7
+0x049B=0x0000
+0x0294=0x0000
+0x011C=0xA941
+0x02D6=0x0000
+0x0311=0x0000
+0x0117=0x280C
+0x02A4=0x0000
+0x0540=0x0000
+0x02E0=0x0000
+0x0118=0x018C
+0x0489=0x0000
+0x04A7=0x0000
+0x0101=0x7800
+0x0558=0x0000
+0x02C6=0x0000
+0x05A1=0x0000
+0x02C9=0x0000
+0x039D=0x0000
+0x0500=0x0000
+0x0450=0x0000
+0x011F=0x3600
+0x030C=0x0000
+0x04DF=0x0000
+0x0106=0x3182
+0x028E=0x0000
+0x0326=0x0000
+0x0113=0x03C3
+0x04CB=0x0000
+0x0391=0x0000
+0x0105=0x0007
+0x02D9=0x0000
+0x02CE=0x0000
+0x044F=0x0000
+0x038B=0x0000
+0x02D4=0x0000
+0x0107=0x318C
+0x0495=0x0000
+0x0246=0x0000
+0x0303=0x0000
+0x02E6=0x0000
+0x045B=0x0000
+0x0340=0x0000
+0x0208=0x0070
+0x0111=0x0083
+0x0247=0x0000
+0x024B=0x0000
+0x045C=0x0000
+0x0383=0x0000
+0x0202=0x07FF
+0x054A=0x0000
+0x0401=0x07FF
+0x0341=0x0000
+0x0287=0x0000
+0x034C=0x0000
+0x0501=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x0406=0x0000
+0x0313=0x0000
+0x010A=0x104C
+0x0461=0x0000
+0x051B=0x0000
+0x0121=0x31FA
+0x0115=0x0009
+[lms7002_registers_a]
+0x0107=0x318C
+0x02D4=0x0000
+0x0082=0x8001
+0x0209=0x0000
+0x02CA=0x0000
+0x04C9=0x0000
+0x0120=0xB9FF
+0x0388=0x0000
+0x029D=0x0000
+0x04A3=0x0000
+0x0208=0x0170
+0x0340=0x0000
+0x0094=0x0000
+0x0244=0x0000
+0x0317=0x0000
+0x00A9=0x8000
+0x0115=0x0009
+0x039A=0x0000
+0x0112=0x3171
+0x048C=0x0000
+0x0023=0x5550
+0x0587=0x1D10
+0x04C0=0x0000
+0x031E=0x0000
+0x0205=0x0000
+0x0361=0x0000
+0x051F=0xAB08
+0x029A=0x0000
+0x0396=0x0000
+0x0284=0x0000
+0x02CE=0x0000
+0x02D9=0x0000
+0x038B=0x0000
+0x044F=0x0000
+0x0367=0x0000
+0x0240=0x0028
+0x05A3=0x0000
+0x0105=0x0007
+0x009B=0x6565
+0x0400=0x0101
+0x02DB=0x0000
+0x0357=0x0000
+0x0104=0x0088
+0x0103=0x0612
+0x0457=0x0000
+0x0347=0x0000
+0x02D8=0x0000
+0x010C=0x8865
+0x0086=0x4101
+0x0202=0x0794
+0x0383=0x0000
+0x020B=0x4000
+0x0108=0xFC26
+0x0098=0x0000
+0x0117=0x100C
+0x0027=0x05E4
+0x00A7=0x6565
+0x024A=0x0000
+0x0029=0x0101
+0x00AD=0x03FF
+0x0540=0x5009
+0x02A4=0x0000
+0x02DE=0x0000
+0x002E=0x0000
+0x0261=0x0000
+0x00AB=0x0040
+0x0564=0x0000
+0x00A8=0x0000
+0x0517=0xC89D
+0x0481=0x0000
+0x02C1=0x0000
+0x0301=0x0000
+0x00A5=0x6565
+0x0515=0x2E45
+0x025C=0x0000
+0x009F=0x658C
+0x0519=0x4049
+0x054B=0xF7A3
+0x02C7=0x0000
+0x038C=0x0000
+0x0307=0x0000
+0x0282=0x0000
+0x0289=0x0000
+0x011C=0xA941
+0x0562=0xF524
+0x0025=0x0101
+0x02CC=0x0000
+0x0116=0x8180
+0x0597=0xFDFB
+0x035F=0x0000
+0x002F=0x3840
+0x0589=0xEA5F
+0x00A2=0x6565
+0x0099=0x6565
+0x0310=0x0000
+0x040C=0x40F8
+0x028B=0x0000
+0x0253=0x0000
+0x00AC=0x2000
+0x002D=0xFFFF
+0x00A6=0x0001
+0x054D=0xF7A3
+0x002C=0x0000
+0x0249=0x0000
+0x04CD=0x0000
+0x0401=0x07FF
+0x00A4=0x6565
+0x054A=0x8184
+0x038F=0x0000
+0x008C=0x267B
+0x0241=0x0000
+0x0356=0x0000
+0x00A1=0x6565
+0x0260=0x0000
+0x0453=0x0000
+0x008A=0x0491
+0x048F=0x0000
+0x0445=0x0000
+0x0350=0x0000
+0x00AA=0x0000
+0x034C=0x0000
+0x0501=0xFDFB
+0x0490=0x0000
+0x02CD=0x0000
+0x050D=0x0F45
+0x0353=0x0000
+0x0024=0x50D8
+0x04E5=0x0000
+0x0512=0x196B
+0x0247=0x0000
+0x045C=0x0000
+0x024B=0x0000
+0x0395=0x0000
+0x011F=0x3600
+0x039D=0x0000
+0x0500=0xF61D
+0x02C9=0x0000
+0x05A1=0x0000
+0x02A6=0x0000
+0x0119=0x18DF
+0x010F=0x3042
+0x04CB=0x0000
+0x0391=0x0000
+0x0113=0x03C3
+0x0326=0x0000
+0x028E=0x0000
+0x0106=0x3182
+0x0524=0x3347
+0x009D=0x6565
+0x0294=0x0000
+0x0026=0x0101
+0x0110=0x0BFF
+0x0122=0x033F
+0x0381=0x0000
+0x009C=0x658C
+0x05A0=0x0000
+0x0482=0x0000
+0x030E=0x0000
+0x0203=0x2F99
+0x0095=0x0000
+0x0111=0x0099
+0x0256=0x0000
+0x0089=0x00A0
+0x0085=0x0001
+0x0088=0x0530
+0x0459=0x0000
+0x0394=0x0000
+0x010E=0x0285
+0x02A0=0x0000
+0x002B=0x4038
+0x039C=0x0000
+0x02D2=0x0000
+0x0581=0xC89D
+0x045D=0x0000
+0x0245=0x0000
+0x002A=0x0086
+0x0118=0x018C
+0x02E0=0x0000
+0x0489=0x0000
+0x04A7=0x0000
+0x039E=0x0000
+0x011D=0xAAAA
+0x02E1=0x0000
+0x0259=0x0000
+0x02D5=0x0000
+0x051D=0x4F91
+0x0243=0x0000
+0x0556=0xA2B5
+0x040A=0x1000
+0x05A2=0x0000
+0x020C=0x8000
+0x020A=0x0080
+0x0102=0x3180
+0x034F=0x0000
+0x0303=0x0000
+0x0306=0x0000
+0x0255=0x0000
+0x0300=0x0000
+0x044E=0x0000
+0x0309=0x0000
+0x0585=0xDAA2
+0x0527=0xACB9
+0x044A=0x0000
+0x04A4=0x0000
+0x048A=0x0000
+0x0392=0x0000
+0x030B=0x0000
+0x05A7=0x0000
+0x0252=0x0000
+0x0204=0xC016
+0x0308=0x0000
+0x0588=0xE6C7
+0x0321=0x0000
+0x0507=0xFCFE
+0x0312=0x0000
+0x050B=0xF5EF
+0x0360=0x0000
+0x0021=0x0E9F
+0x04C2=0x0000
+0x030D=0x0000
+0x040E=0x0003
+0x0316=0x0000
+0x031F=0x0000
+0x030C=0x0000
+0x04DF=0x0000
+0x0318=0x0000
+0x0250=0x0000
+0x02CB=0x0000
+0x045E=0x0000
+0x0440=0x0024
+0x031D=0x0000
+0x058D=0xF5EF
+0x02D7=0x0000
+0x0380=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0566=0x0906
+0x0345=0x0000
+0x049C=0x0000
+0x02E3=0x0000
+0x0397=0x0000
+0x035B=0x0000
+0x0505=0x00D8
+0x028D=0x0000
+0x02A1=0x0000
+0x028F=0x0000
+0x031C=0x0000
+0x031A=0x0000
+0x0363=0x0000
+0x0596=0x0A94
+0x0354=0x0000
+0x0518=0xEFF2
+0x035C=0x0000
+0x034D=0x0000
+0x0344=0x0000
+0x0561=0xAB08
+0x0096=0x0000
+0x010D=0x00DE
+0x04C4=0x0000
+0x0351=0x0000
+0x0311=0x0000
+0x02D6=0x0000
+0x02D1=0x0000
+0x0546=0x8D44
+0x04C8=0x0000
+0x048B=0x0000
+0x0358=0x0000
+0x0522=0xDB10
+0x049F=0x0000
+0x034A=0x0000
+0x0455=0x0000
+0x0359=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x0341=0x0000
+0x0287=0x0000
+0x04DA=0x0000
+0x025E=0x0000
+0x0580=0xEFF2
+0x0409=0x0000
+0x059A=0x0000
+0x048D=0x0000
+0x0514=0xE7E2
+0x039B=0x0000
+0x0101=0x7800
+0x0558=0x5009
+0x02C6=0x0000
+0x051B=0xB77F
+0x0313=0x0000
+0x010A=0x104C
+0x0461=0x0000
+0x0406=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x034B=0x0000
+0x011A=0x2E14
+0x029F=0x0000
+0x030A=0x0000
+0x034E=0x0000
+0x0293=0x0000
+0x03A6=0x0000
+0x0560=0x174B
+0x0404=0x0000
+0x00A0=0x6565
+0x0547=0xD7B7
+0x0454=0x0000
+0x0448=0x0000
+0x0327=0x0000
+0x0305=0x0000
+0x0393=0x0000
+0x0510=0xE6C7
+0x0302=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0365=0x0000
+0x048E=0x0000
+0x0022=0x07FF
+0x0283=0x0000
+0x044B=0x0000
+0x045A=0x0000
+0x02DA=0x0000
+0x04E4=0x0000
+0x02E4=0x0000
+0x03A5=0x0000
+0x040B=0x000F
+0x0366=0x0000
+0x0443=0x0000
+0x0508=0xEF99
+0x00A3=0x6565
+0x02E2=0x0000
+0x044D=0x0000
+0x0314=0x0000
+0x0458=0x0000
+0x0493=0x0000
+0x0346=0x0000
+0x024E=0x0000
+0x055E=0xDB10
+0x0402=0x07D9
+0x0384=0x0000
+0x02E6=0x0000
+0x045B=0x0000
+0x0480=0x0000
+0x0567=0x4049
+0x04CA=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0460=0x0000
+0x0559=0xACB9
+0x0456=0x0000
+0x0441=0x0000
+0x0444=0x0000
+0x0390=0x0000
+0x0451=0x0000
+0x049E=0x0000
+0x0324=0x0000
+0x02E7=0x0000
+0x038E=0x0000
+0x0403=0x0013
+0x04D8=0x0000
+0x029B=0x0000
+0x0491=0x0000
+0x03A1=0x0000
+0x04E1=0x0000
+0x02A2=0x0000
+0x051C=0x0000
+0x03A2=0x0000
+0x0407=0x0000
+0x0258=0x0000
+0x0502=0x0A94
+0x038A=0x0000
+0x0362=0x0000
+0x028C=0x0000
+0x0352=0x0000
+0x0385=0x0000
+0x0315=0x0000
+0x040D=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x0405=0x0000
+0x0254=0x0000
+0x0398=0x0000
+0x0408=0x0000
+0x0487=0x0000
+0x038D=0x0000
+0x035E=0x0000
+0x03A7=0x0000
+0x0520=0x174B
+0x0449=0x0000
+0x02C8=0x0000
+0x035A=0x0000
+0x0387=0x0000
+0x0386=0x0000
+0x0452=0x0000
+0x0299=0x0000
+0x0084=0x0400
+0x0498=0x0000
+0x0348=0x0000
+0x02D0=0x0000
+0x054E=0x8184
+0x03A0=0x0000
+0x009A=0x658C
+0x055D=0xA6B5
+0x0298=0x0000
+0x0364=0x0000
+0x0081=0x0000
+0x0325=0x0000
+0x040F=0x43E4
+0x04E3=0x0000
+0x050E=0x17DC
+0x0516=0x150F
+0x0389=0x0000
+0x054F=0x18C9
+0x0304=0x0000
+0x04D5=0x0000
+0x059B=0x0000
+0x0322=0x0000
+0x0442=0x0000
+0x035D=0x0000
+0x0492=0x0000
+0x04A1=0x0000
+0x0382=0x0000
+0x0288=0x0000
+0x0296=0x0000
+0x0555=0xBD96
+0x0349=0x0000
+0x0484=0x0000
+0x0586=0x196B
+0x0281=0x0000
+0x0200=0x0301
+0x0594=0xF40D
+0x02C5=0x0000
+0x0319=0x0000
+0x0121=0x3760
+0x025B=0x0000
+0x0290=0x0000
+0x02DF=0x0000
+0x0291=0x0000
+0x029C=0x0000
+0x008B=0x278A
+0x02A3=0x0000
+0x05A4=0x0000
+0x02A7=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x02C2=0x0000
+0x02C4=0x0000
+0x0207=0x0000
+0x04C6=0x0000
+0x0093=0x0000
+0x02D3=0x0000
+0x0494=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x0251=0x0000
+0x0488=0x0000
+0x0496=0x0000
+0x04C3=0x0000
+0x0100=0x3409
+0x04CC=0x0000
+0x02A5=0x0000
+0x0257=0x0000
+0x04D6=0x0000
+0x04A6=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x0097=0x0000
+0x011E=0x0A2A
+0x0285=0x0000
+0x0280=0x0000
+0x0020=0xFFFD
+0x02DD=0x0000
+0x0297=0x0000
+0x044C=0x0000
+0x0355=0x0000
+0x04A0=0x0000
+0x02CF=0x0000
+0x04D1=0x0000
+0x0526=0xBE2A
+0x0092=0x0001
+0x031B=0x0000
+0x0541=0x4C24
+0x0543=0xBD96
+0x02C0=0x0000
+0x0499=0x0000
+0x0513=0xDAA2
+0x0549=0x18C9
+0x0552=0x8D44
+0x0521=0x5852
+0x0509=0x0605
+0x0286=0x0000
+0x024F=0x0000
+0x04E0=0x0000
+0x0545=0x364E
+0x0551=0xD7B7
+0x055F=0x5852
+0x009E=0x658C
+0x0598=0xF61D
+0x0123=0x067B
+0x0497=0x0000
+0x04A5=0x0000
+0x0565=0xB77F
+0x0124=0x0000
+0x0592=0x0DF1
+0x0591=0xFCFE
+0x0548=0x79FA
+0x04D2=0x0000
+0x0599=0x0000
+0x0511=0x1D10
+0x0506=0x0DF1
+0x0595=0x00BC
+0x0584=0xE7E2
+0x0242=0x0000
+0x025A=0x0000
+0x04E2=0x0000
+0x04C5=0x0000
+0x058C=0xEA50
+0x0450=0x0000
+0x058A=0x17DC
+0x059D=0x0000
+0x0485=0x0000
+0x058E=0x1316
+0x0550=0x79FA
+0x0554=0x6901
+0x0593=0x00D8
+0x0553=0x364E
+0x0542=0xA2B5
+0x0563=0x4F91
+0x024D=0x0000
+0x055A=0xBE2A
+0x0295=0x0000
+0x028A=0x0000
+0x059C=0x0000
+0x04DD=0x0000
+0x054C=0x7FFF
+0x0582=0x150F
+0x0109=0x8CC1
+0x04A2=0x0000
+0x0292=0x0000
+0x0583=0x2E45
+0x059F=0x0000
+0x0525=0x57AC
+0x0523=0xA6B5
+0x0206=0x0000
+0x051A=0x0906
+0x055C=0x3347
+0x05A6=0x0000
+0x050F=0xEA5F
+0x051E=0xF524
+0x050A=0x1316
+0x04C7=0x0000
+0x049D=0x0000
+0x050C=0xEA50
+0x0087=0x0000
+0x0399=0x0000
+0x0495=0x0000
+0x0246=0x0000
+0x0503=0x00BC
+0x0320=0x0000
+0x0323=0x0000
+0x055B=0x57AC
+0x0114=0x0110
+0x02E5=0x0000
+0x04E7=0x0000
+0x04D0=0x0000
+0x04E6=0x0000
+0x00AE=0x0000
+0x0544=0x6901
+0x04DE=0x0000
+0x058B=0x0F45
+0x0028=0x0101
+0x029E=0x0000
+0x04DC=0x0000
+0x04D9=0x0000
+0x058F=0x0605
+0x0557=0x4C24
+0x04DB=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x024C=0x0000
+0x02DC=0x0000
+0x04D4=0x0000
+0x0504=0xF40D
+0x02C3=0x0000
+0x04C1=0x0000
+0x04D3=0x0000
+0x0590=0xEF99
+0x04CE=0x0000
+0x05A5=0x0000
+[file_info]
+version=1
+type=lms7002m_minimal_config
diff --git a/targets/ARCH/LMSSDR/enb_sodera_lowband_Wrx_5MHz_rx19dB_txfull.ini b/targets/ARCH/LMSSDR/enb_sodera_lowband_Wrx_5MHz_rx19dB_txfull.ini
new file mode 100644
index 0000000000000000000000000000000000000000..0243742f32e2297a96e2cf49f8ca19545cfee859
--- /dev/null
+++ b/targets/ARCH/LMSSDR/enb_sodera_lowband_Wrx_5MHz_rx19dB_txfull.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0493=0x0000
+0x0492=0x0000
+0x0491=0x0000
+0x029B=0x0000
+0x048E=0x0000
+0x0022=0x07FF
+0x0283=0x0000
+0x0487=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0480=0x0000
+0x0460=0x0000
+0x0447=0x0000
+0x045A=0x0000
+0x02DA=0x0000
+0x0458=0x0000
+0x0314=0x0000
+0x0456=0x0000
+0x0559=0xACB9
+0x0451=0x0000
+0x0390=0x0000
+0x044B=0x0000
+0x0448=0x0000
+0x0454=0x0000
+0x0446=0x0000
+0x04CA=0x0000
+0x0444=0x0000
+0x0443=0x0000
+0x0508=0xEF99
+0x0441=0x0000
+0x040D=0x0000
+0x040B=0x000F
+0x0409=0x0000
+0x0580=0xEFF2
+0x0407=0x0000
+0x0405=0x0000
+0x0254=0x0000
+0x0404=0x0000
+0x00A0=0x6565
+0x0560=0x174B
+0x0403=0x009C
+0x0402=0x07FF
+0x055E=0xDB10
+0x03A7=0x0000
+0x0520=0x174B
+0x03A5=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x03A2=0x0000
+0x051C=0x0000
+0x048D=0x0000
+0x059A=0x0000
+0x03A1=0x0000
+0x02A2=0x0000
+0x04E1=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x039B=0x0000
+0x0408=0x0000
+0x0398=0x0000
+0x0393=0x0000
+0x0305=0x0000
+0x038E=0x0000
+0x0324=0x0000
+0x02E7=0x0000
+0x038D=0x0000
+0x0387=0x0000
+0x03A0=0x0000
+0x02D0=0x0000
+0x009A=0x658C
+0x054E=0x8184
+0x0386=0x0000
+0x040F=0x0000
+0x04E3=0x0000
+0x0389=0x0000
+0x054F=0x18C9
+0x0385=0x0000
+0x0315=0x0000
+0x0384=0x0000
+0x0382=0x0000
+0x0288=0x0000
+0x0366=0x0000
+0x0365=0x0000
+0x0364=0x0000
+0x0325=0x0000
+0x0081=0x0000
+0x0362=0x0000
+0x038A=0x0000
+0x035E=0x0000
+0x035D=0x0000
+0x0442=0x0000
+0x0449=0x0000
+0x035A=0x0000
+0x02C8=0x0000
+0x0452=0x0000
+0x0299=0x0000
+0x0359=0x0000
+0x0358=0x0000
+0x048B=0x0000
+0x0354=0x0000
+0x0351=0x0000
+0x03A6=0x0000
+0x0293=0x0000
+0x034E=0x0000
+0x035C=0x0000
+0x034D=0x0000
+0x034B=0x0000
+0x011A=0x2E03
+0x0455=0x0000
+0x034A=0x0000
+0x0348=0x0000
+0x0084=0x0400
+0x0498=0x0000
+0x035B=0x0000
+0x0505=0x00D8
+0x0345=0x0000
+0x0484=0x0000
+0x0586=0x196B
+0x0344=0x0000
+0x0561=0xAB08
+0x0343=0x0000
+0x0342=0x0000
+0x0380=0x0000
+0x0327=0x0000
+0x0322=0x0000
+0x059B=0x0000
+0x0321=0x0000
+0x045E=0x0000
+0x0440=0x0024
+0x031D=0x0000
+0x0363=0x0000
+0x031A=0x0000
+0x031C=0x0000
+0x028F=0x0000
+0x0341=0x0000
+0x0287=0x0000
+0x0318=0x0000
+0x031F=0x0000
+0x0316=0x0000
+0x030D=0x0000
+0x040E=0x0000
+0x0352=0x0000
+0x028C=0x0000
+0x0360=0x0000
+0x0313=0x0000
+0x0461=0x0000
+0x010A=0x184C
+0x051B=0xB77F
+0x0312=0x0000
+0x0346=0x0000
+0x024E=0x0000
+0x0311=0x0000
+0x02D6=0x0000
+0x030C=0x0000
+0x04DF=0x0000
+0x030B=0x0000
+0x0392=0x0000
+0x030A=0x0000
+0x029F=0x0000
+0x0309=0x0000
+0x048A=0x0000
+0x0308=0x0000
+0x0588=0xE6C7
+0x0397=0x0000
+0x02E3=0x0000
+0x049C=0x0000
+0x044A=0x0000
+0x04A4=0x0000
+0x0306=0x0000
+0x0304=0x0000
+0x04D5=0x0000
+0x0303=0x0000
+0x0302=0x0000
+0x0510=0xE6C7
+0x044E=0x0000
+0x0300=0x0000
+0x034F=0x0000
+0x045B=0x0000
+0x02E6=0x0000
+0x00A3=0x6565
+0x04DA=0x0000
+0x025E=0x0000
+0x020A=0x0000
+0x0102=0x3180
+0x020C=0x8000
+0x05A2=0x0000
+0x040A=0x1000
+0x0556=0xA2B5
+0x0243=0x0000
+0x051D=0x4F91
+0x0259=0x0000
+0x02D5=0x0000
+0x02E1=0x0000
+0x011D=0xFEEE
+0x039E=0x0000
+0x0252=0x0000
+0x0204=0xFFAD
+0x0255=0x0000
+0x0281=0x0000
+0x0200=0x0301
+0x0594=0xF40D
+0x02C5=0x0000
+0x0406=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x0319=0x0000
+0x0121=0x313C
+0x0101=0x7800
+0x025B=0x0000
+0x02C6=0x0000
+0x0558=0x5009
+0x0021=0x0E9F
+0x04C2=0x0000
+0x0290=0x0000
+0x02DF=0x0000
+0x0291=0x0000
+0x0296=0x0000
+0x029C=0x0000
+0x028D=0x0000
+0x02A1=0x0000
+0x008B=0x278A
+0x02A3=0x0000
+0x05A4=0x0000
+0x02A7=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x02C2=0x0000
+0x02C4=0x0000
+0x044D=0x0000
+0x02E2=0x0000
+0x02D1=0x0000
+0x0546=0x8D44
+0x04C8=0x0000
+0x0207=0x0000
+0x04C6=0x0000
+0x0096=0x0000
+0x0093=0x0000
+0x0250=0x0000
+0x02CB=0x0000
+0x02D3=0x0000
+0x0494=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x0251=0x0000
+0x0488=0x0000
+0x0496=0x0000
+0x04C3=0x0000
+0x0100=0xB409
+0x04CC=0x0000
+0x02A5=0x0000
+0x0257=0x0000
+0x04D6=0x0000
+0x04A6=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x0097=0x0000
+0x011E=0x0663
+0x0285=0x0000
+0x0280=0x0000
+0x049E=0x0000
+0x0020=0xFFFD
+0x02DD=0x0000
+0x0297=0x0000
+0x049F=0x0000
+0x0522=0xDB10
+0x044C=0x0000
+0x0355=0x0000
+0x04A0=0x0000
+0x02CF=0x0000
+0x04D1=0x0000
+0x0526=0xBE2A
+0x0092=0x0001
+0x031B=0x0000
+0x0541=0x4C24
+0x0518=0xEFF2
+0x0543=0xBD96
+0x02C0=0x0000
+0x0499=0x0000
+0x04A1=0x0000
+0x058D=0xF5EF
+0x02D7=0x0000
+0x0513=0xDAA2
+0x0549=0x18C9
+0x0552=0x8D44
+0x0521=0x5852
+0x0509=0x0605
+0x0286=0x0000
+0x024F=0x0000
+0x04E0=0x0000
+0x0545=0x364E
+0x0349=0x0000
+0x0555=0xBD96
+0x04E4=0x0000
+0x02E4=0x0000
+0x0551=0xD7B7
+0x055D=0xA6B5
+0x0298=0x0000
+0x055F=0x5852
+0x009E=0x658C
+0x0547=0xD7B7
+0x0598=0xF61D
+0x0123=0x267B
+0x0497=0x0000
+0x04A5=0x0000
+0x0565=0xB77F
+0x0124=0x0000
+0x0592=0x0DF1
+0x0591=0xFCFE
+0x0548=0x79FA
+0x04D2=0x0000
+0x0599=0x0000
+0x0511=0x1D10
+0x0506=0x0DF1
+0x0595=0x00BC
+0x0584=0xE7E2
+0x0242=0x0000
+0x025A=0x0000
+0x04E2=0x0000
+0x04C5=0x0000
+0x058C=0xEA50
+0x0450=0x0000
+0x0596=0x0A94
+0x05A7=0x0000
+0x058A=0x17DC
+0x059D=0x0000
+0x0485=0x0000
+0x058E=0x1316
+0x0550=0x79FA
+0x0554=0x6901
+0x0593=0x00D8
+0x0542=0xA2B5
+0x0553=0x364E
+0x0563=0x4F91
+0x024D=0x0000
+0x0567=0x4049
+0x055A=0xBE2A
+0x0295=0x0000
+0x0566=0x0906
+0x028A=0x0000
+0x059C=0x0000
+0x04DD=0x0000
+0x054C=0x7FFF
+0x0582=0x150F
+0x0585=0xDAA2
+0x0109=0x03C1
+0x04A2=0x0000
+0x0292=0x0000
+0x059F=0x0000
+0x0583=0x2E45
+0x050E=0x17DC
+0x0516=0x150F
+0x0523=0xA6B5
+0x0525=0x57AC
+0x0206=0x0000
+0x051A=0x0906
+0x055C=0x3347
+0x0514=0xE7E2
+0x050F=0xEA5F
+0x05A6=0x0000
+0x051E=0xF524
+0x050A=0x1316
+0x04C7=0x0000
+0x049D=0x0000
+0x0527=0xACB9
+0x050C=0xEA50
+0x0087=0x0000
+0x0399=0x0000
+0x050B=0xF5EF
+0x0507=0xFCFE
+0x010D=0x01DC
+0x04C4=0x0000
+0x0495=0x0000
+0x0246=0x0000
+0x0503=0x00BC
+0x0320=0x0000
+0x0323=0x0000
+0x02E5=0x0000
+0x055B=0x57AC
+0x0114=0x0170
+0x04D8=0x0000
+0x04E7=0x0000
+0x04D0=0x0000
+0x04E6=0x0000
+0x00AE=0x0000
+0x0544=0x6901
+0x0258=0x0000
+0x0502=0x0A94
+0x04DE=0x0000
+0x058B=0x0F45
+0x0028=0x0101
+0x029E=0x0000
+0x04DC=0x0000
+0x04D9=0x0000
+0x0557=0x4C24
+0x058F=0x0605
+0x04DB=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x024C=0x0000
+0x02DC=0x0000
+0x04D4=0x0000
+0x0504=0xF40D
+0x02C3=0x0000
+0x04C1=0x0000
+0x04D3=0x0000
+0x0590=0xEF99
+0x04CE=0x0000
+0x05A5=0x0000
+0x04A7=0x0000
+0x0489=0x0000
+0x02E0=0x0000
+0x0118=0x218C
+0x002A=0x0086
+0x0245=0x0000
+0x045D=0x0000
+0x0581=0xC89D
+0x02D2=0x0000
+0x039C=0x0000
+0x002B=0x4032
+0x02A0=0x0000
+0x010E=0x070C
+0x0394=0x0000
+0x0459=0x0000
+0x0088=0x0530
+0x0085=0x0001
+0x0089=0x00A0
+0x0256=0x0000
+0x0111=0x0099
+0x0095=0x0000
+0x0203=0x2F6C
+0x030E=0x0000
+0x0482=0x0000
+0x05A0=0x0000
+0x009C=0x658C
+0x0381=0x0000
+0x0122=0x033F
+0x0110=0x0BFF
+0x0026=0x0101
+0x0294=0x0000
+0x009D=0x6565
+0x0524=0x3347
+0x0106=0x3182
+0x028E=0x0000
+0x0326=0x0000
+0x0113=0x03C3
+0x0391=0x0000
+0x04CB=0x0000
+0x010F=0x3042
+0x0119=0x529F
+0x02A6=0x0000
+0x05A1=0x0000
+0x02C9=0x0000
+0x0500=0xF61D
+0x039D=0x0000
+0x011F=0x3680
+0x0395=0x0000
+0x024B=0x0000
+0x045C=0x0000
+0x0247=0x0000
+0x0512=0x196B
+0x04E5=0x0000
+0x0024=0x50D8
+0x0353=0x0000
+0x050D=0x0F45
+0x02CD=0x0000
+0x0490=0x0000
+0x0501=0xFDFB
+0x034C=0x0000
+0x00AA=0x0000
+0x0350=0x0000
+0x0445=0x0000
+0x048F=0x0000
+0x008A=0x0491
+0x0453=0x0000
+0x0260=0x0000
+0x00A1=0x6565
+0x0356=0x0000
+0x0241=0x0000
+0x008C=0x267B
+0x038F=0x0000
+0x054A=0x8184
+0x00A4=0x6565
+0x0401=0x07ED
+0x04CD=0x0000
+0x0249=0x0000
+0x002C=0x0100
+0x054D=0xF7A3
+0x00A6=0x0001
+0x002D=0xFFFF
+0x00AC=0x2000
+0x0253=0x0000
+0x028B=0x0000
+0x040C=0x40F8
+0x0310=0x0000
+0x0099=0x6565
+0x00A2=0x6565
+0x0589=0xEA5F
+0x002F=0x3840
+0x035F=0x0000
+0x0597=0xFDFB
+0x0116=0x8180
+0x02CC=0x0000
+0x0025=0x0101
+0x0562=0xF524
+0x011C=0xAD41
+0x0289=0x0000
+0x0282=0x0000
+0x0307=0x0000
+0x038C=0x0000
+0x02C7=0x0000
+0x054B=0xF7A3
+0x0519=0x4049
+0x009F=0x658C
+0x025C=0x0000
+0x0515=0x2E45
+0x00A5=0x6565
+0x0301=0x0000
+0x02C1=0x0000
+0x0481=0x0000
+0x0517=0xC89D
+0x00A8=0x0000
+0x0564=0x0000
+0x00AB=0x0040
+0x0261=0x0000
+0x002E=0x0000
+0x02DE=0x0000
+0x02A4=0x0000
+0x0540=0x5009
+0x00AD=0x03FF
+0x0029=0x0101
+0x024A=0x0000
+0x00A7=0x6565
+0x0027=0x05E4
+0x0117=0x1939
+0x0098=0x0000
+0x0108=0xFC26
+0x020B=0x0000
+0x0383=0x0000
+0x0202=0x07F9
+0x0086=0x4101
+0x010C=0x8865
+0x02D8=0x0000
+0x0347=0x0000
+0x0457=0x0000
+0x0103=0x0A12
+0x0104=0x0088
+0x0357=0x0000
+0x02DB=0x0000
+0x0400=0x0101
+0x009B=0x6565
+0x0105=0x0007
+0x05A3=0x0000
+0x0240=0x0028
+0x0367=0x0000
+0x044F=0x0000
+0x038B=0x0000
+0x02D9=0x0000
+0x02CE=0x0000
+0x0284=0x0000
+0x0396=0x0000
+0x029A=0x0000
+0x051F=0xAB08
+0x0361=0x0000
+0x0205=0x0000
+0x031E=0x0000
+0x04C0=0x0000
+0x0587=0x1D10
+0x0023=0x5550
+0x048C=0x0000
+0x0112=0x20E5
+0x039A=0x0000
+0x0115=0x0009
+0x00A9=0x8000
+0x0317=0x0000
+0x0244=0x0000
+0x0094=0x0000
+0x0340=0x0000
+0x0208=0x0170
+0x04A3=0x0000
+0x029D=0x0000
+0x0388=0x0000
+0x0120=0xB9FF
+0x04C9=0x0000
+0x02CA=0x0000
+0x0209=0x0000
+0x0082=0x8001
+0x02D4=0x0000
+0x0107=0x318C
+[lms7002_registers_b]
+0x04E1=0x0000
+0x03A1=0x0000
+0x02A2=0x0000
+0x04E0=0x0000
+0x04DE=0x0000
+0x058B=0x0000
+0x04DC=0x0000
+0x04DB=0x0000
+0x04D9=0x0000
+0x04D5=0x0000
+0x0304=0x0000
+0x04D4=0x0000
+0x0504=0x0000
+0x04D3=0x0000
+0x04D2=0x0000
+0x0548=0x0000
+0x04D0=0x0000
+0x04CF=0x0000
+0x025F=0x0000
+0x04CE=0x0000
+0x04CC=0x0000
+0x02A5=0x0000
+0x04C6=0x0000
+0x0207=0x0000
+0x04C1=0x0000
+0x02C3=0x0000
+0x04C9=0x0000
+0x02CA=0x0000
+0x04C0=0x0000
+0x031E=0x0000
+0x04D6=0x0000
+0x0257=0x0000
+0x04A6=0x0000
+0x04A5=0x0000
+0x04A2=0x0000
+0x0109=0x61C1
+0x049D=0x0000
+0x04C7=0x0000
+0x049C=0x0000
+0x0397=0x0000
+0x02E3=0x0000
+0x0499=0x0000
+0x02C0=0x0000
+0x0496=0x0000
+0x04C3=0x0000
+0x0493=0x0000
+0x04A1=0x0000
+0x0492=0x0000
+0x0491=0x0000
+0x029B=0x0000
+0x048E=0x0000
+0x0283=0x0000
+0x048C=0x0000
+0x048B=0x0000
+0x0358=0x0000
+0x0487=0x0000
+0x0486=0x0000
+0x045F=0x0000
+0x0480=0x0000
+0x0460=0x0000
+0x0447=0x0000
+0x045A=0x0000
+0x02DA=0x0000
+0x0458=0x0000
+0x0314=0x0000
+0x0456=0x0000
+0x0559=0x0000
+0x0453=0x0000
+0x0451=0x0000
+0x0390=0x0000
+0x044D=0x0000
+0x02E2=0x0000
+0x044B=0x0000
+0x0448=0x0000
+0x0454=0x0000
+0x0446=0x0000
+0x04CA=0x0000
+0x0444=0x0000
+0x0443=0x0000
+0x0508=0x0000
+0x0441=0x0000
+0x040D=0x0000
+0x040B=0x7FFF
+0x0409=0x0000
+0x0580=0x0000
+0x0407=0x0000
+0x0405=0x0000
+0x0254=0x0000
+0x0404=0x0000
+0x0560=0x0000
+0x04D8=0x0000
+0x0403=0x0000
+0x0402=0x07FF
+0x055E=0x0000
+0x03A7=0x0000
+0x0520=0x0000
+0x03A5=0x0000
+0x03A4=0x0000
+0x03A3=0x0000
+0x03A2=0x0000
+0x051C=0x0000
+0x048D=0x0000
+0x059A=0x0000
+0x049E=0x0000
+0x039F=0x0000
+0x0248=0x0000
+0x039B=0x0000
+0x0399=0x0000
+0x0408=0x0000
+0x0398=0x0000
+0x0497=0x0000
+0x0123=0x267B
+0x0394=0x0000
+0x0459=0x0000
+0x0393=0x0000
+0x0305=0x0000
+0x038E=0x0000
+0x0324=0x0000
+0x02E7=0x0000
+0x038D=0x0000
+0x0395=0x0000
+0x038A=0x0000
+0x0362=0x0000
+0x0387=0x0000
+0x0200=0x0081
+0x0594=0x0000
+0x02C5=0x0000
+0x02A7=0x0000
+0x0318=0x0000
+0x0544=0x0000
+0x049A=0x0000
+0x0388=0x0000
+0x0120=0xB9FF
+0x020A=0x0080
+0x0102=0x3180
+0x0290=0x0000
+0x02DF=0x0000
+0x0291=0x0000
+0x0295=0x0000
+0x055A=0x0000
+0x029C=0x0000
+0x010E=0x2040
+0x02A0=0x0000
+0x010F=0x3042
+0x02A6=0x0000
+0x0119=0x18CB
+0x02D2=0x0000
+0x039C=0x0000
+0x028D=0x0000
+0x02A1=0x0000
+0x02C2=0x0000
+0x045E=0x0000
+0x031D=0x0000
+0x0440=0x0020
+0x02C4=0x0000
+0x04D1=0x0000
+0x02CF=0x0000
+0x02C1=0x0000
+0x02C7=0x0000
+0x054B=0x0000
+0x02D3=0x0000
+0x04C8=0x0000
+0x02D1=0x0000
+0x0546=0x0000
+0x0306=0x0000
+0x02D7=0x0000
+0x058D=0x0000
+0x0457=0x0000
+0x02D8=0x0000
+0x0347=0x0000
+0x0103=0x0A12
+0x0104=0x0088
+0x0357=0x0000
+0x02DB=0x0000
+0x0400=0x0081
+0x0209=0x0000
+0x0297=0x0000
+0x02DD=0x0000
+0x029E=0x0000
+0x02DE=0x0000
+0x0527=0x0000
+0x02D5=0x0000
+0x02E1=0x0000
+0x0259=0x0000
+0x0481=0x0000
+0x0517=0x0000
+0x029A=0x0000
+0x051F=0x0000
+0x0483=0x0000
+0x0201=0x07FF
+0x0507=0x0000
+0x0321=0x0000
+0x034F=0x0000
+0x0296=0x0000
+0x0510=0x0000
+0x0302=0x0000
+0x038C=0x0000
+0x0307=0x0000
+0x0282=0x0000
+0x0392=0x0000
+0x030B=0x0000
+0x0588=0x0000
+0x0308=0x0000
+0x048A=0x0000
+0x044A=0x0000
+0x04A4=0x0000
+0x04C4=0x0000
+0x010D=0x009E
+0x0300=0x0000
+0x0587=0x0000
+0x044E=0x0000
+0x0309=0x0000
+0x0585=0x0000
+0x02E5=0x0000
+0x055B=0x0000
+0x0114=0x008D
+0x0323=0x0000
+0x0320=0x0000
+0x0503=0x0000
+0x0513=0x0000
+0x0319=0x0000
+0x0260=0x0000
+0x0549=0x0000
+0x0552=0x0000
+0x0509=0x0000
+0x0521=0x0000
+0x0286=0x0000
+0x04D7=0x0000
+0x059E=0x0000
+0x0557=0x0000
+0x058F=0x0000
+0x0322=0x0000
+0x059B=0x0000
+0x0545=0x0000
+0x0349=0x0000
+0x0555=0x0000
+0x02E4=0x0000
+0x04E4=0x0000
+0x0551=0x0000
+0x0312=0x0000
+0x055D=0x0000
+0x0298=0x0000
+0x055F=0x0000
+0x011D=0x699D
+0x039E=0x0000
+0x0547=0x0000
+0x0598=0x0000
+0x0449=0x0000
+0x0564=0x0000
+0x0242=0x0000
+0x0525=0x0000
+0x0523=0x0000
+0x0565=0x0000
+0x0124=0x0000
+0x0592=0x0000
+0x0591=0x0000
+0x0563=0x0000
+0x024D=0x0000
+0x0567=0x0000
+0x05A5=0x0000
+0x0566=0x0000
+0x030A=0x0000
+0x029F=0x0000
+0x054C=0x0000
+0x0582=0x0000
+0x0599=0x0000
+0x0511=0x0000
+0x0506=0x0000
+0x0301=0x0000
+0x0595=0x0000
+0x0584=0x0000
+0x058C=0x0000
+0x051E=0x0000
+0x05A6=0x0000
+0x050F=0x0000
+0x0590=0x0000
+0x05A0=0x0000
+0x0596=0x0000
+0x05A7=0x0000
+0x0562=0x0000
+0x058A=0x0000
+0x059D=0x0000
+0x0485=0x0000
+0x0581=0x0000
+0x045D=0x0000
+0x0245=0x0000
+0x0310=0x0000
+0x058E=0x0000
+0x05A2=0x0000
+0x054D=0x0000
+0x020C=0x7FFF
+0x0589=0x0000
+0x0522=0x0000
+0x049F=0x0000
+0x031F=0x0000
+0x0292=0x0000
+0x059F=0x0000
+0x0583=0x0000
+0x0543=0x0000
+0x0317=0x0000
+0x0244=0x0000
+0x0554=0x0000
+0x0593=0x0000
+0x05A4=0x0000
+0x02A3=0x0000
+0x0553=0x0000
+0x0542=0x0000
+0x0519=0x0000
+0x024F=0x0000
+0x0524=0x0000
+0x0518=0x0000
+0x0354=0x0000
+0x0526=0x0000
+0x031B=0x0000
+0x050E=0x0000
+0x0516=0x0000
+0x02CB=0x0000
+0x0250=0x0000
+0x031C=0x0000
+0x028F=0x0000
+0x051A=0x0000
+0x055C=0x0000
+0x0514=0x0000
+0x050A=0x0000
+0x050C=0x0000
+0x050B=0x0000
+0x04E7=0x0000
+0x04E6=0x0000
+0x04E5=0x0000
+0x0512=0x0000
+0x0206=0x0000
+0x0550=0x0000
+0x0360=0x0000
+0x030E=0x0000
+0x0203=0x0000
+0x0482=0x0000
+0x0541=0x0000
+0x0122=0x033F
+0x0110=0x0BF4
+0x0204=0x0000
+0x0252=0x0000
+0x011E=0x06B9
+0x049B=0x0000
+0x0294=0x0000
+0x011C=0xAD41
+0x02D6=0x0000
+0x0311=0x0000
+0x0117=0x280C
+0x02A4=0x0000
+0x0540=0x0000
+0x02E0=0x0000
+0x0118=0x018C
+0x0489=0x0000
+0x04A7=0x0000
+0x0101=0x7800
+0x0558=0x0000
+0x02C6=0x0000
+0x05A1=0x0000
+0x02C9=0x0000
+0x039D=0x0000
+0x0500=0x0000
+0x0450=0x0000
+0x011F=0x3680
+0x030C=0x0000
+0x04DF=0x0000
+0x0281=0x0000
+0x0106=0x3182
+0x028E=0x0000
+0x0326=0x0000
+0x0113=0x03C3
+0x04CB=0x0000
+0x0391=0x0000
+0x0105=0x0007
+0x02D9=0x0000
+0x02CE=0x0000
+0x038B=0x0000
+0x044F=0x0000
+0x02D4=0x0000
+0x0107=0x318C
+0x0495=0x0000
+0x0246=0x0000
+0x0303=0x0000
+0x02E6=0x0000
+0x045B=0x0000
+0x0100=0x3409
+0x0340=0x0000
+0x0208=0x0070
+0x0111=0x0083
+0x0247=0x0000
+0x024B=0x0000
+0x045C=0x0000
+0x0383=0x0000
+0x0202=0x07FF
+0x054A=0x0000
+0x0401=0x07FF
+0x0341=0x0000
+0x0287=0x0000
+0x034C=0x0000
+0x0501=0x0000
+0x030F=0x0000
+0x025D=0x0000
+0x0406=0x0000
+0x0313=0x0000
+0x010A=0x104C
+0x0461=0x0000
+0x051B=0x0000
+0x0121=0x333C
+0x0115=0x0009
+0x0112=0xC0E6
+0x039A=0x0000
+0x02CC=0x0000
+0x0116=0x8180
+0x04A0=0x0000
+0x0108=0x9442
+0x020B=0x4000
+0x0251=0x0000
+0x0488=0x0000
+0x0241=0x0000
+0x038F=0x0000
+0x02DC=0x0000
+0x024C=0x0000
+0x0494=0x0000
+0x051D=0x0000
+0x0243=0x0000
+0x0556=0x0000
+0x040A=0x0000
+0x04CD=0x0000
+0x0249=0x0000
+0x0261=0x0000
+0x024A=0x0000
+0x0285=0x0000
+0x0280=0x0000
+0x0346=0x0000
+0x024E=0x0000
+0x0253=0x0000
+0x028B=0x0000
+0x040C=0x0000
+0x0255=0x0000
+0x0258=0x0000
+0x0502=0x0000
+0x05A3=0x0000
+0x0367=0x0000
+0x0240=0x0020
+0x0256=0x0000
+0x025A=0x0000
+0x04E2=0x0000
+0x04C5=0x0000
+0x025B=0x0000
+0x0205=0x0000
+0x0361=0x0000
+0x0515=0x0000
+0x025C=0x0000
+0x0355=0x0000
+0x044C=0x0000
+0x010C=0x88FD
+0x0284=0x0000
+0x0396=0x0000
+0x0363=0x0000
+0x031A=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x04DD=0x0000
+0x059C=0x0000
+0x0352=0x0000
+0x028C=0x0000
+0x04C2=0x0000
+0x04DA=0x0000
+0x025E=0x0000
+0x0327=0x0000
+0x0380=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0561=0x0000
+0x035A=0x0000
+0x02C8=0x0000
+0x0484=0x0000
+0x0586=0x0000
+0x0597=0x0000
+0x035F=0x0000
+0x0345=0x0000
+0x0505=0x0000
+0x035B=0x0000
+0x034A=0x0000
+0x0455=0x0000
+0x011A=0x2E02
+0x034B=0x0000
+0x034D=0x0000
+0x035C=0x0000
+0x034E=0x0000
+0x0293=0x0000
+0x03A6=0x0000
+0x0350=0x0000
+0x0445=0x0000
+0x048F=0x0000
+0x0351=0x0000
+0x0353=0x0000
+0x050D=0x0000
+0x02CD=0x0000
+0x0490=0x0000
+0x0498=0x0000
+0x0348=0x0000
+0x0356=0x0000
+0x030D=0x0000
+0x0316=0x0000
+0x040E=0x0000
+0x04A3=0x0000
+0x029D=0x0000
+0x0359=0x0000
+0x0299=0x0000
+0x0452=0x0000
+0x0442=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x0325=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0381=0x0000
+0x0288=0x0000
+0x0382=0x0000
+0x0384=0x0000
+0x0315=0x0000
+0x0385=0x0000
+0x04E3=0x0000
+0x040F=0x0000
+0x0389=0x0000
+0x054F=0x0000
+0x0386=0x0000
+0x02D0=0x0000
+0x054E=0x0000
+0x03A0=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 71c12e63dce642d3b467ec09479f6162cc0511a2..ece81dc7c3ba1c061983cb04daa797ff60e19f1a 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -29,7 +29,7 @@
 
 /** usrp_lib.cpp
  *
- * Author: HongliangXU : hong-liang-xu@agilent.com
+ * \author: HongliangXU : hong-liang-xu@agilent.com
  */
 
 #include <string.h>
@@ -55,47 +55,71 @@
 #  include <immintrin.h>
 #endif
 
+/** @addtogroup _USRP_PHY_RF_INTERFACE_
+ * @{
+ */
+
+/*! \brief USRP Configuration */ 
 typedef struct
 {
 
   // --------------------------------
   // variables for USRP configuration
   // --------------------------------
+  //! USRP device pointer
   uhd::usrp::multi_usrp::sptr usrp;
   //uhd::usrp::multi_usrp::sptr rx_usrp;
   
   //create a send streamer and a receive streamer
+  //! USRP TX Stream
   uhd::tx_streamer::sptr tx_stream;
+  //! USRP RX Stream
   uhd::rx_streamer::sptr rx_stream;
 
+  //! USRP TX Metadata
   uhd::tx_metadata_t tx_md;
+  //! USRP RX Metadata
   uhd::rx_metadata_t rx_md;
 
+  //! USRP Timestamp Information
   uhd::time_spec_t tm_spec;
+
   //setup variables and allocate buffer
+  //! USRP Metadata
   uhd::async_metadata_t async_md;
 
+  //! Sampling rate
   double sample_rate;
-  // time offset between transmiter timestamp and receiver timestamp;
+
+  //! time offset between transmiter timestamp and receiver timestamp;
   double tdiff;
-  // use usrp_time_offset to get this value
+
+  //! TX forward samples. We use usrp_time_offset to get this value
   int tx_forward_nsamps; //166 for 20Mhz
 
 
   // --------------------------------
   // Debug and output control
   // --------------------------------
+  //! Number of underflows
   int num_underflows;
+  //! Number of overflows
   int num_overflows;
+  
+  //! Number of sequential errors
   int num_seq_errors;
-
+  //! tx count
   int64_t tx_count;
+  //! rx count
   int64_t rx_count;
+  //! timestamp of RX packet
   openair0_timestamp rx_timestamp;
 
 } usrp_state_t;
 
-
+/*! \brief Called to start the USRP transceiver. Return 0 if OK, < 0 if error
+    @param device pointer to the device structure specific to the RF hardware target
+*/
 static int trx_usrp_start(openair0_device *device)
 {
   usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -118,7 +142,9 @@ static int trx_usrp_start(openair0_device *device)
 
   return 0;
 }
-
+/*! \brief Terminate operation of the USRP transceiver -- free all associated resources 
+ * \param device the hardware to use
+ */
 static void trx_usrp_end(openair0_device *device)
 {
   usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -132,6 +158,14 @@ static void trx_usrp_end(openair0_device *device)
   
 }
 
+/*! \brief Called to send samples to the USRP RF target
+      @param device pointer to the device structure specific to the RF hardware target
+      @param timestamp The timestamp at whicch the first sample MUST be sent 
+      @param buff Buffer which holds the samples
+      @param nsamps number of samples to be sent
+      @param antenna_id index of the antenna if the device has multiple anteannas
+      @param flags flags must be set to TRUE if timestamp parameter needs to be applied
+*/ 
 static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps, int cc, int flags)
 {
   usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -153,6 +187,17 @@ static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp,
   return 0;
 }
 
+/*! \brief Receive samples from hardware.
+ * Read \ref nsamps samples from each channel to buffers. buff[0] is the array for
+ * the first channel. *ptimestamp is the time at which the first sample
+ * was received.
+ * \param device the hardware to use
+ * \param[out] ptimestamp the time at which the first sample was received.
+ * \param[out] buff An array of pointers to buffers for received samples. The buffers must be large enough to hold the number of samples \ref nsamps.
+ * \param nsamps Number of samples. One sample is 2 byte I + 2 byte Q => 4 byte.
+ * \param antenna_id Index of antenna for which to receive samples
+ * \returns the number of sample read
+*/
 static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp, void **buff, int nsamps, int cc)
 {
    usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -172,7 +217,7 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
 #endif
 
 
-  if (device->type == USRP_B200_IF) {  
+  if (device->type == USRP_B200_DEV) {  
     if (cc>1) {
     // receive multiple channels (e.g. RF A and RF B)
       std::vector<void *> buff_ptrs;
@@ -198,7 +243,7 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
 #endif
       }
     }
-  } else if (device->type == USRP_X300_IF) {
+  } else if (device->type == USRP_X300_DEV) {
     if (cc>1) {
     // receive multiple channels (e.g. RF A and RF B)
       std::vector<void *> buff_ptrs;
@@ -238,6 +283,9 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
   return samples_received;
 }
 
+/*! \brief Get current timestamp of USRP
+ * \param device the hardware to use
+*/
 openair0_timestamp get_usrp_time(openair0_device *device) 
 {
  
@@ -246,11 +294,21 @@ openair0_timestamp get_usrp_time(openair0_device *device)
   return s->usrp->get_time_now().to_ticks(s->sample_rate);
 } 
 
+/*! \brief Compares two variables within precision
+ * \param a first variable
+ * \param b second variable
+*/
 static bool is_equal(double a, double b)
 {
   return std::fabs(a-b) < std::numeric_limits<double>::epsilon();
 }
 
+/*! \brief Set frequencies (TX/RX)
+ * \param device the hardware to use
+ * \param openair0_cfg RF frontend parameters set by application
+ * \param dummy dummy variable not used
+ * \returns 0 in success 
+ */
 int trx_usrp_set_freq(openair0_device* device, openair0_config_t *openair0_cfg, int dummy) {
 
   usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -262,6 +320,11 @@ int trx_usrp_set_freq(openair0_device* device, openair0_config_t *openair0_cfg,
   
 }
 
+/*! \brief Set RX frequencies 
+ * \param device the hardware to use
+ * \param openair0_cfg RF frontend parameters set by application
+ * \returns 0 in success 
+ */
 int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg) {
 
   usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -279,6 +342,11 @@ int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *open
   
 }
 
+/*! \brief Set Gains (TX/RX)
+ * \param device the hardware to use
+ * \param openair0_cfg RF frontend parameters set by application
+ * \returns 0 in success 
+ */
 int trx_usrp_set_gains(openair0_device* device, 
 		       openair0_config_t *openair0_cfg) {
 
@@ -299,11 +367,14 @@ int trx_usrp_set_gains(openair0_device* device,
   return(0);
 }
 
+/*! \brief Stop USRP
+ * \param card refers to the hardware index to use
+ */
 int trx_usrp_stop(int card) {
   return(0);
 }
 
-
+/*! \brief USRPB210 RX calibration table */
 rx_gain_calib_table_t calib_table_b210[] = {
   {3500000000.0,44.0},
   {2660000000.0,49.0},
@@ -312,6 +383,7 @@ rx_gain_calib_table_t calib_table_b210[] = {
   {816000000.0,58.0},
   {-1,0}};
 
+/*! \brief USRPB210 RX calibration table */
 rx_gain_calib_table_t calib_table_b210_38[] = {
   {3500000000.0,44.0},
   {2660000000.0,49.8},
@@ -320,6 +392,7 @@ rx_gain_calib_table_t calib_table_b210_38[] = {
   {816000000.0,57.0},
   {-1,0}};
 
+/*! \brief USRPx310 RX calibration table */
 rx_gain_calib_table_t calib_table_x310[] = {
   {3500000000.0,77.0},
   {2660000000.0,81.0},
@@ -328,6 +401,11 @@ rx_gain_calib_table_t calib_table_x310[] = {
   {816000000.0,85.0},
   {-1,0}};
 
+/*! \brief Set RX gain offset 
+ * \param openair0_cfg RF frontend parameters set by application
+ * \param chain_index RF chain to apply settings to
+ * \returns 0 in success 
+ */
 void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_gain_adjust) {
 
   int i=0;
@@ -373,12 +451,20 @@ void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_
   
 }
 
-
+/*! \brief print the USRP statistics  
+* \param device the hardware to use
+* \returns  0 on success
+*/
 int trx_usrp_get_stats(openair0_device* device) {
 
   return(0);
 
 }
+
+/*! \brief Reset the USRP statistics  
+* \param device the hardware to use
+* \returns  0 on success
+*/
 int trx_usrp_reset_stats(openair0_device* device) {
 
   return(0);
@@ -386,13 +472,20 @@ int trx_usrp_reset_stats(openair0_device* device) {
 }
 
 
-int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_cfg)
-{
-  uhd::set_thread_priority_safe(1.0);
-  usrp_state_t *s = (usrp_state_t*)malloc(sizeof(usrp_state_t));
-  memset(s, 0, sizeof(usrp_state_t));
 
-  // Initialize USRP device
+extern "C" {
+/*! \brief Initialize Openair USRP target. It returns 0 if OK
+* \param device the hardware to use
+* \param openair0_cfg RF frontend parameters set by application
+*/
+  int device_init(openair0_device* device, openair0_config_t *openair0_cfg) {
+    
+    uhd::set_thread_priority_safe(1.0);
+    usrp_state_t *s = (usrp_state_t*)malloc(sizeof(usrp_state_t));
+    memset(s, 0, sizeof(usrp_state_t));
+    
+    // Initialize USRP device
+
 
   std::string args = "type=b200";
 
@@ -436,14 +529,14 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
     s->usrp->set_clock_source("internal");
     
     //Setting device type to USRP X300/X310 
-    device->type=USRP_X300_IF;
+    device->type=USRP_X300_DEV;
 
     // this is not working yet, master clock has to be set via constructor
     // set master clock rate and sample rate for tx & rx for streaming
     //s->usrp->set_master_clock_rate(usrp_master_clock);
 
     openair0_cfg[0].rx_gain_calib_table = calib_table_x310;
-
+    
     switch ((int)openair0_cfg[0].sample_rate) {
     case 30720000:
             // from usrp_time_offset
@@ -487,13 +580,13 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
 
     //  s->usrp->set_rx_subdev_spec(rx_subdev);
     //  s->usrp->set_tx_subdev_spec(tx_subdev);
-
-// do not explicitly set the clock to "internal", because this will disable the gpsdo
-//    // lock mboard clocks
-//    s->usrp->set_clock_source("internal");
+    
+    // do not explicitly set the clock to "internal", because this will disable the gpsdo
+    //    // lock mboard clocks
+    //    s->usrp->set_clock_source("internal");
     // set master clock rate and sample rate for tx & rx for streaming
 
-    device->type = USRP_B200_IF;
+    device->type = USRP_B200_DEV;
 
 
     if ((vers == 3) && (subvers == 9) && (subsubvers>=2)) {
@@ -553,6 +646,12 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
     }
   }
 
+  /* device specific */
+  openair0_cfg[0].txlaunch_wait = 1;//manage when TX processing is triggered
+  openair0_cfg[0].txlaunch_wait_slotcount = 1; //manage when TX processing is triggered
+  openair0_cfg[0].iq_txshift = 4;//shift
+  openair0_cfg[0].iq_rxrescale = 15;//rescale iqs
+  
   for(i=0;i<s->usrp->get_rx_num_channels();i++) {
     if (i<openair0_cfg[0].rx_num_channels) {
       s->usrp->set_rx_rate(openair0_cfg[0].sample_rate,i);
@@ -606,10 +705,7 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
 
 
   s->usrp->set_time_now(uhd::time_spec_t(0.0));
-
-
-
-  
+ 
 
   for (i=0;i<openair0_cfg[0].rx_num_channels;i++) {
     if (i<openair0_cfg[0].rx_num_channels) {
@@ -657,4 +753,6 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
   if(is_equal(s->sample_rate, (double)7.68e6))
     s->tx_forward_nsamps = 50;
   return 0;
+  }
 }
+/*@}*/
diff --git a/targets/DOCS/Doxyfile b/targets/DOCS/Doxyfile
index 0d32a3ffad73ffc7d69b0870a28f2fd394979ef9..ac6ee99480063889df7bec664722b23229e47ff9 100644
--- a/targets/DOCS/Doxyfile
+++ b/targets/DOCS/Doxyfile
@@ -793,7 +793,10 @@ INPUT                  = $(OPENAIR1_DIR)/PHY/defs.h \
                          $(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um.h \
                          $(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um_entity.h \
                          $(OPENAIR2_DIR)/NETWORK_DRIVER/MESH/proto_extern.h \
-                         $(OPENAIR_TARGETS)/ARCH/COMMON/common_lib.h
+                         $(OPENAIR_TARGETS)/ARCH/COMMON/common_lib.h \
+                         $(OPENAIR_TARGETS)/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp \
+                         $(OPENAIR_TARGETS)/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c \
+                         $(OPENAIR_TARGETS)/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.sedora.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.sedora.conf
new file mode 100644
index 0000000000000000000000000000000000000000..2d0b63e4b0a2f1135cb420b14d066006d2c2337e
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.sedora.conf
@@ -0,0 +1,171 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+    
+    cell_type =  "CELL_MACRO_ENB";
+    
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+    
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+    
+    mobile_country_code =  "208";
+    
+    mobile_network_code =  "93";
+    
+       ////////// Physical parameters:
+  
+    component_carriers = (
+    		       	 {
+  			   frame_type					      = "FDD";	
+                           tdd_config 					      = 3;
+                           tdd_config_s            			      = 0;
+ 			   prefix_type             			      = "NORMAL";
+  			   eutra_band              			      = 7;
+                           downlink_frequency      			      = 751000000L;
+                           uplink_frequency_offset 			      = 30000000;
+  			   Nid_cell					      = 0;
+                           N_RB_DL                 			      = 50;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1; 
+			   tx_gain                                            = 60;
+			   rx_gain                                            = 111;
+                           prach_root              			      = 0;
+                           prach_config_index      			      = 0;
+                           prach_high_speed        			      = "DISABLE";
+  	                   prach_zero_correlation  			      = 1;
+                           prach_freq_offset       			      = 2;
+			   pucch_delta_shift       			      = 1;
+                           pucch_nRB_CQI           			      = 1;
+                           pucch_nCS_AN            			      = 0;
+                           pucch_n1_AN             			      = 32;
+                           pdsch_referenceSignalPower 			      = -29;
+                           pdsch_p_b                  			      = 0;
+                           pusch_n_SB                 			      = 1; 
+                           pusch_enable64QAM          			      = "DISABLE";
+			   pusch_hoppingMode                                  = "interSubFrame";
+			   pusch_hoppingOffset                                = 0;
+     	                   pusch_groupHoppingEnabled  			      = "ENABLE";
+	                   pusch_groupAssignment      			      = 0;
+	                   pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+	                   pusch_nDMRS1                                       = 1;
+	                   phich_duration                                     = "NORMAL";
+	                   phich_resource                                     = "ONESIXTH";
+	                   srs_enable                                         = "DISABLE";
+	               /*  srs_BandwidthConfig                                =;
+	                   srs_SubframeConfig                                 =;
+	                   srs_ackNackST                                      =;
+	                   srs_MaxUpPts                                       =;*/  
+
+	                   pusch_p0_Nominal                                   = -85; 
+	                   pusch_alpha                                        = "AL1";
+	                   pucch_p0_Nominal                                   = -96;
+	                   msg3_delta_Preamble                                = 6;
+	                   pucch_deltaF_Format1                               = "deltaF2";
+	                   pucch_deltaF_Format1b                              = "deltaF3";
+	                   pucch_deltaF_Format2                               = "deltaF0";
+	                   pucch_deltaF_Format2a                              = "deltaF0";
+  	                   pucch_deltaF_Format2b		    	      = "deltaF0";
+	
+                           rach_numberOfRA_Preambles                          = 64;
+                           rach_preamblesGroupAConfig                         = "DISABLE";
+/*
+                           rach_sizeOfRA_PreamblesGroupA                      = ;
+                           rach_messageSizeGroupA                             = ;
+                           rach_messagePowerOffsetGroupB                      = ; 
+*/
+                           rach_powerRampingStep                              = 4;
+	                   rach_preambleInitialReceivedTargetPower            = -100;
+                           rach_preambleTransMax                              = 10;
+	                   rach_raResponseWindowSize                          = 10;
+	                   rach_macContentionResolutionTimer                  = 48;
+	                   rach_maxHARQ_Msg3Tx                                = 4;
+
+			   pcch_default_PagingCycle                           = 128;
+			   pcch_nB                                            = "oneT";
+			   bcch_modificationPeriodCoeff			      = 2;
+			   ue_TimersAndConstants_t300			      = 1000;
+			   ue_TimersAndConstants_t301			      = 1000;
+			   ue_TimersAndConstants_t310			      = 1000;
+			   ue_TimersAndConstants_t311			      = 10000;
+			   ue_TimersAndConstants_n310			      = 20;
+			   ue_TimersAndConstants_n311			      = 1;
+
+			 }
+			 );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] 
+        timer_poll_retransmit    = 80;
+        
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+        
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+        
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+        
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+        
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+    
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+        
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.11";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : 
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.215/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.215/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+    
+    log_config : 
+    {
+	global_log_level                      ="info"; 
+    	global_log_verbosity                  ="medium";
+	hw_log_level                          ="info"; 
+    	hw_log_verbosity                      ="medium";
+	phy_log_level                         ="info"; 
+    	phy_log_verbosity                     ="medium";
+	mac_log_level                         ="info"; 
+    	mac_log_verbosity                     ="high";
+	rlc_log_level                         ="info"; 
+    	rlc_log_verbosity                     ="medium";
+	pdcp_log_level                        ="info"; 
+    	pdcp_log_verbosity                    ="medium";
+	rrc_log_level                         ="info"; 
+    	rrc_log_verbosity                     ="medium";
+   };	
+   
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.rrh.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.rrh.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..98226144ab062cbef4a3b0835b524d7cea58a765
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.rrh.usrpb210.conf
@@ -0,0 +1,190 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "95";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 13;
+      downlink_frequency      			      = 751000000L;
+      uplink_frequency_offset 			      = 31000000;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 25;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 100;
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 1;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 32;
+      pdsch_referenceSignalPower 			      = -15;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -86;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -96;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.62";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+rrh_gw_config = (
+ {			  
+    local_if_name = "eth0";			  
+    #remote_address = "169.254.10.158";	
+    #local_address = "169.254.8.15";				  
+    remote_address = "74:d4:35:cc:88:45";
+    local_address = "98:90:96:df:66:07";    
+    local_port = 50000;	#for raw option local port must be the same to remote	       
+    remote_port = 50000; 
+    rrh_gw_active = "yes";
+    tr_preference = "raw";
+    rf_preference = "usrp_b200";
+    iq_txshift = 5;
+    tx_sample_advance = 70;	
+    tx_scheduling_advance = 9; 	                
+                             
+}
+);  
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.242/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.242/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..69d85362170e8e45bcb859e5ccff8a3de9fd779a
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.usrpb210.conf
@@ -0,0 +1,171 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "95";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 13;
+      downlink_frequency      			      = 751000000L;
+      uplink_frequency_offset 			      = 31000000;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 25;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 100;
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 1;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 32;
+      pdsch_referenceSignalPower 			      = -15;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -86;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -96;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.62";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.242/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.242/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band4.tm1.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band4.tm1.usrpb210.conf
index ee4700c771fd8343246cf7f4b7ebfce230736585..853db14393ea2a084eb42866cdb26beb13ac9e14 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band4.tm1.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band4.tm1.usrpb210.conf
@@ -17,7 +17,7 @@ eNBs =
 
     mobile_country_code =  "208";
 
-    mobile_network_code =  "92";
+    mobile_network_code =  "93";
 
        ////////// Physical parameters:
 
@@ -36,7 +36,7 @@ eNBs =
         nb_antennas_tx          			      = 1;
         nb_antennas_rx          			      = 1;
         tx_gain                                            = 90;
-        rx_gain                                            = 120;
+        rx_gain                                            = 128;
         prach_root              			      = 0;
         prach_config_index      			      = 0;
         prach_high_speed        			      = "DISABLE";
@@ -66,7 +66,7 @@ eNBs =
 
         pusch_p0_Nominal                                   = -90;
         pusch_alpha                                        = "AL1";
-        pucch_p0_Nominal                                   = -108;
+        pucch_p0_Nominal                                   = -96;
         msg3_delta_Preamble                                = 6;
         pucch_deltaF_Format1                               = "deltaF2";
         pucch_deltaF_Format1b                              = "deltaF3";
@@ -131,7 +131,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.13.11";
+    mme_ip_address      = ( { ipv4       = "192.168.12.11";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -141,10 +141,10 @@ eNBs =
     NETWORK_INTERFACES :
     {
       ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-      ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.13.10/24";
+      ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.215/24";
 
       ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-      ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+      ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.215/24";
       ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.bladerfx40.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.bladerfx40.conf
index 5f7ac3d65f5c066cdf33f8661296ccddd5770f7f..eb3895dc6d60a82465550128a353274cfb00595e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.bladerfx40.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.bladerfx40.conf
@@ -17,7 +17,7 @@ eNBs =
     
     mobile_country_code =  "208";
     
-    mobile_network_code =  "92";
+    mobile_network_code =  "93";
     
        ////////// Physical parameters:
   
@@ -132,7 +132,7 @@ eNBs =
     };
         
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.13.11";
+    mme_ip_address      = ( { ipv4       = "192.168.12.11";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -142,10 +142,10 @@ eNBs =
     NETWORK_INTERFACES : 
     {
         ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.13.10/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.215/24";
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.215/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e001bd12e9393009a5ac157dc6ff045c7b4f8728
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
@@ -0,0 +1,171 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+    
+    cell_type =  "CELL_MACRO_ENB";
+    
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+    
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+    
+    mobile_country_code =  "208";
+    
+    mobile_network_code =  "93";
+    
+       ////////// Physical parameters:
+  
+    component_carriers = (
+    		       	 {
+  			   frame_type					      = "FDD";	
+                           tdd_config 					      = 3;
+                           tdd_config_s            			      = 0;
+ 			   prefix_type             			      = "NORMAL";
+  			   eutra_band              			      = 7;
+                           downlink_frequency      			      = 2660000000L;
+                           uplink_frequency_offset 			      = -120000000;
+  			   Nid_cell					      = 0;
+                           N_RB_DL                 			      = 50;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1; 
+			   tx_gain                                            = 60;
+			   rx_gain                                            = 111;
+                           prach_root              			      = 0;
+                           prach_config_index      			      = 0;
+                           prach_high_speed        			      = "DISABLE";
+  	                   prach_zero_correlation  			      = 1;
+                           prach_freq_offset       			      = 2;
+			   pucch_delta_shift       			      = 1;
+                           pucch_nRB_CQI           			      = 1;
+                           pucch_nCS_AN            			      = 0;
+                           pucch_n1_AN             			      = 32;
+                           pdsch_referenceSignalPower 			      = -29;
+                           pdsch_p_b                  			      = 0;
+                           pusch_n_SB                 			      = 1; 
+                           pusch_enable64QAM          			      = "DISABLE";
+			   pusch_hoppingMode                                  = "interSubFrame";
+			   pusch_hoppingOffset                                = 0;
+     	                   pusch_groupHoppingEnabled  			      = "ENABLE";
+	                   pusch_groupAssignment      			      = 0;
+	                   pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+	                   pusch_nDMRS1                                       = 1;
+	                   phich_duration                                     = "NORMAL";
+	                   phich_resource                                     = "ONESIXTH";
+	                   srs_enable                                         = "DISABLE";
+	               /*  srs_BandwidthConfig                                =;
+	                   srs_SubframeConfig                                 =;
+	                   srs_ackNackST                                      =;
+	                   srs_MaxUpPts                                       =;*/  
+
+	                   pusch_p0_Nominal                                   = -85; 
+	                   pusch_alpha                                        = "AL1";
+	                   pucch_p0_Nominal                                   = -96;
+	                   msg3_delta_Preamble                                = 6;
+	                   pucch_deltaF_Format1                               = "deltaF2";
+	                   pucch_deltaF_Format1b                              = "deltaF3";
+	                   pucch_deltaF_Format2                               = "deltaF0";
+	                   pucch_deltaF_Format2a                              = "deltaF0";
+  	                   pucch_deltaF_Format2b		    	      = "deltaF0";
+	
+                           rach_numberOfRA_Preambles                          = 64;
+                           rach_preamblesGroupAConfig                         = "DISABLE";
+/*
+                           rach_sizeOfRA_PreamblesGroupA                      = ;
+                           rach_messageSizeGroupA                             = ;
+                           rach_messagePowerOffsetGroupB                      = ; 
+*/
+                           rach_powerRampingStep                              = 4;
+	                   rach_preambleInitialReceivedTargetPower            = -100;
+                           rach_preambleTransMax                              = 10;
+	                   rach_raResponseWindowSize                          = 10;
+	                   rach_macContentionResolutionTimer                  = 48;
+	                   rach_maxHARQ_Msg3Tx                                = 4;
+
+			   pcch_default_PagingCycle                           = 128;
+			   pcch_nB                                            = "oneT";
+			   bcch_modificationPeriodCoeff			      = 2;
+			   ue_TimersAndConstants_t300			      = 1000;
+			   ue_TimersAndConstants_t301			      = 1000;
+			   ue_TimersAndConstants_t310			      = 1000;
+			   ue_TimersAndConstants_t311			      = 10000;
+			   ue_TimersAndConstants_n310			      = 20;
+			   ue_TimersAndConstants_n311			      = 1;
+
+			 }
+			 );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] 
+        timer_poll_retransmit    = 80;
+        
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+        
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+        
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+        
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+        
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+    
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+        
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.171";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : 
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.242/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.242/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+    
+    log_config : 
+    {
+	global_log_level                      ="info"; 
+    	global_log_verbosity                  ="medium";
+	hw_log_level                          ="info"; 
+    	hw_log_verbosity                      ="medium";
+	phy_log_level                         ="info"; 
+    	phy_log_verbosity                     ="medium";
+	mac_log_level                         ="info"; 
+    	mac_log_verbosity                     ="high";
+	rlc_log_level                         ="info"; 
+    	rlc_log_verbosity                     ="medium";
+	pdcp_log_level                        ="info"; 
+    	pdcp_log_verbosity                    ="medium";
+	rrc_log_level                         ="info"; 
+    	rrc_log_verbosity                     ="medium";
+   };	
+   
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4cd761645b3e339c9b4cff404e974352a5f1f832
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+    
+    cell_type =  "CELL_MACRO_ENB";
+    
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+    
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+    
+    mobile_country_code =  "208";
+    
+    mobile_network_code =  "93";
+    
+       ////////// Physical parameters:
+  
+    component_carriers = (
+    		       	 {
+  			   frame_type					      = "FDD";	
+                           tdd_config 					      = 3;
+                           tdd_config_s            			      = 0;
+ 			   prefix_type             			      = "NORMAL";
+  			   eutra_band              			      = 7;
+                           downlink_frequency      			      = 2660000000L;
+                           uplink_frequency_offset 			      = -120000000;
+  			   Nid_cell					      = 0;
+                           N_RB_DL                 			      = 50;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1; 
+			   tx_gain                                            = 60;
+			   rx_gain                                            = 111;
+                           prach_root              			      = 0;
+                           prach_config_index      			      = 0;
+                           prach_high_speed        			      = "DISABLE";
+  	                   prach_zero_correlation  			      = 1;
+                           prach_freq_offset       			      = 2;
+			   pucch_delta_shift       			      = 1;
+                           pucch_nRB_CQI           			      = 1;
+                           pucch_nCS_AN            			      = 0;
+                           pucch_n1_AN             			      = 32;
+                           pdsch_referenceSignalPower 			      = -29;
+                           pdsch_p_b                  			      = 0;
+                           pusch_n_SB                 			      = 1; 
+                           pusch_enable64QAM          			      = "DISABLE";
+			   pusch_hoppingMode                                  = "interSubFrame";
+			   pusch_hoppingOffset                                = 0;
+     	                   pusch_groupHoppingEnabled  			      = "ENABLE";
+	                   pusch_groupAssignment      			      = 0;
+	                   pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+	                   pusch_nDMRS1                                       = 1;
+	                   phich_duration                                     = "NORMAL";
+	                   phich_resource                                     = "ONESIXTH";
+	                   srs_enable                                         = "DISABLE";
+	               /*  srs_BandwidthConfig                                =;
+	                   srs_SubframeConfig                                 =;
+	                   srs_ackNackST                                      =;
+	                   srs_MaxUpPts                                       =;*/  
+
+	                   pusch_p0_Nominal                                   = -85; 
+	                   pusch_alpha                                        = "AL1";
+	                   pucch_p0_Nominal                                   = -96;
+	                   msg3_delta_Preamble                                = 6;
+	                   pucch_deltaF_Format1                               = "deltaF2";
+	                   pucch_deltaF_Format1b                              = "deltaF3";
+	                   pucch_deltaF_Format2                               = "deltaF0";
+	                   pucch_deltaF_Format2a                              = "deltaF0";
+  	                   pucch_deltaF_Format2b		    	      = "deltaF0";
+	
+                           rach_numberOfRA_Preambles                          = 64;
+                           rach_preamblesGroupAConfig                         = "DISABLE";
+/*
+                           rach_sizeOfRA_PreamblesGroupA                      = ;
+                           rach_messageSizeGroupA                             = ;
+                           rach_messagePowerOffsetGroupB                      = ; 
+*/
+                           rach_powerRampingStep                              = 4;
+	                   rach_preambleInitialReceivedTargetPower            = -100;
+                           rach_preambleTransMax                              = 10;
+	                   rach_raResponseWindowSize                          = 10;
+	                   rach_macContentionResolutionTimer                  = 48;
+	                   rach_maxHARQ_Msg3Tx                                = 4;
+
+			   pcch_default_PagingCycle                           = 128;
+			   pcch_nB                                            = "oneT";
+			   bcch_modificationPeriodCoeff			      = 2;
+			   ue_TimersAndConstants_t300			      = 1000;
+			   ue_TimersAndConstants_t301			      = 1000;
+			   ue_TimersAndConstants_t310			      = 1000;
+			   ue_TimersAndConstants_t311			      = 10000;
+			   ue_TimersAndConstants_n310			      = 20;
+			   ue_TimersAndConstants_n311			      = 1;
+
+			 }
+			 );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] 
+        timer_poll_retransmit    = 80;
+        
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+        
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+        
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+        
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+        
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+ 
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.170";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+rrh_gw_config = (
+ {			  
+    local_if_name = "eth0";			  
+    #remote_address = "169.254.10.158";	
+    #local_address = "169.254.8.15";        
+    remote_address = "74:d4:35:cc:88:45";
+    local_address = "d4:be:d9:22:0a:ac";
+    local_port = 50000;	    #for raw option local port must be the same to remote	       
+    remote_port = 50000; 
+    rrh_gw_active = "yes";
+    tr_preference = "raw";
+    rf_preference = "lmssdr";
+    iq_txshift = 0;
+    tx_sample_advance = 45;	
+    tx_scheduling_advance = 8; 	                
+                             
+}
+);  
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth6";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.118/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth6";
+
+
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.118/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..604f5567efa411e6a239672ebfe855447ff50c60
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf
@@ -0,0 +1,190 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+     ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "92";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        frame_type					      = "FDD";
+        tdd_config 					      = 3;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 7;
+        downlink_frequency      			      = 2680000000L;
+        uplink_frequency_offset 			      = -120000000;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 50;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 32;
+        pdsch_referenceSignalPower 			      = -29;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+        /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -90;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -96;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+        */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -108;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+      }
+    );
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+rrh_gw_config = (
+ {			  
+    local_if_name = "eth0";			  
+    #remote_address = "169.254.10.158";	
+    #local_address = "169.254.8.15";
+    remote_address = "74:d4:35:cc:88:45";
+    local_address = "98:90:96:df:66:07";
+    local_port = 50000;	    #for raw option local port must be the same to remote	       
+    remote_port = 50000; 
+    rrh_gw_active = "yes";
+    tr_preference = "raw";
+    rf_preference = "usrp_b200";
+    iq_txshift = 5;
+    tx_sample_advance = 113;	
+    tx_scheduling_advance = 9; 	                
+                             
+}
+);  
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+
+
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf
index 5c53803c4dd4d9fe9fd822df0b98f6b7c104e44e..5a6a9a462bdeabd1fde804c0788cc52f7366c427 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf
@@ -142,10 +142,10 @@ eNBs =
     NETWORK_INTERFACES : 
     {
         ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.212/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.215/24";
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.212/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.215/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf
new file mode 100644
index 0000000000000000000000000000000000000000..47e2179d18a264782163ec0ecae9ceceddb6a495
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf
@@ -0,0 +1,171 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+    
+    cell_type =  "CELL_MACRO_ENB";
+    
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+    
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+    
+    mobile_country_code =  "208";
+    
+    mobile_network_code =  "92";
+    
+       ////////// Physical parameters:
+  
+    component_carriers = (
+    		       	 {
+  			   frame_type					      = "FDD";	
+                           tdd_config 					      = 3;
+                           tdd_config_s            			      = 0;
+ 			   prefix_type             			      = "NORMAL";
+  			   eutra_band              			      = 7;
+                           downlink_frequency      			      = 2660000000L;
+                           uplink_frequency_offset 			      = -120000000;
+  			   Nid_cell					      = 0;
+                           N_RB_DL                 			      = 25;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1; 
+			   tx_gain                                            = 60;
+			   rx_gain                                            = 111;
+                           prach_root              			      = 0;
+                           prach_config_index      			      = 0;
+                           prach_high_speed        			      = "DISABLE";
+  	                   prach_zero_correlation  			      = 1;
+                           prach_freq_offset       			      = 2;
+			   pucch_delta_shift       			      = 1;
+                           pucch_nRB_CQI           			      = 1;
+                           pucch_nCS_AN            			      = 0;
+                           pucch_n1_AN             			      = 32;
+                           pdsch_referenceSignalPower 			      = -29;
+                           pdsch_p_b                  			      = 0;
+                           pusch_n_SB                 			      = 1; 
+                           pusch_enable64QAM          			      = "DISABLE";
+			   pusch_hoppingMode                                  = "interSubFrame";
+			   pusch_hoppingOffset                                = 0;
+     	                   pusch_groupHoppingEnabled  			      = "ENABLE";
+	                   pusch_groupAssignment      			      = 0;
+	                   pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+	                   pusch_nDMRS1                                       = 1;
+	                   phich_duration                                     = "NORMAL";
+	                   phich_resource                                     = "ONESIXTH";
+	                   srs_enable                                         = "DISABLE";
+	               /*  srs_BandwidthConfig                                =;
+	                   srs_SubframeConfig                                 =;
+	                   srs_ackNackST                                      =;
+	                   srs_MaxUpPts                                       =;*/  
+
+	                   pusch_p0_Nominal                                   = -85; 
+	                   pusch_alpha                                        = "AL1";
+	                   pucch_p0_Nominal                                   = -96;
+	                   msg3_delta_Preamble                                = 6;
+	                   pucch_deltaF_Format1                               = "deltaF2";
+	                   pucch_deltaF_Format1b                              = "deltaF3";
+	                   pucch_deltaF_Format2                               = "deltaF0";
+	                   pucch_deltaF_Format2a                              = "deltaF0";
+  	                   pucch_deltaF_Format2b		    	      = "deltaF0";
+	
+                           rach_numberOfRA_Preambles                          = 64;
+                           rach_preamblesGroupAConfig                         = "DISABLE";
+/*
+                           rach_sizeOfRA_PreamblesGroupA                      = ;
+                           rach_messageSizeGroupA                             = ;
+                           rach_messagePowerOffsetGroupB                      = ; 
+*/
+                           rach_powerRampingStep                              = 4;
+	                   rach_preambleInitialReceivedTargetPower            = -100;
+                           rach_preambleTransMax                              = 10;
+	                   rach_raResponseWindowSize                          = 10;
+	                   rach_macContentionResolutionTimer                  = 48;
+	                   rach_maxHARQ_Msg3Tx                                = 4;
+
+			   pcch_default_PagingCycle                           = 128;
+			   pcch_nB                                            = "oneT";
+			   bcch_modificationPeriodCoeff			      = 2;
+			   ue_TimersAndConstants_t300			      = 1000;
+			   ue_TimersAndConstants_t301			      = 1000;
+			   ue_TimersAndConstants_t310			      = 1000;
+			   ue_TimersAndConstants_t311			      = 10000;
+			   ue_TimersAndConstants_n310			      = 20;
+			   ue_TimersAndConstants_n311			      = 1;
+
+			 }
+			 );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] 
+        timer_poll_retransmit    = 80;
+        
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+        
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+        
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+        
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+        
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+    
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+        
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.170";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : 
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.242/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.242/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+    
+    log_config : 
+    {
+	global_log_level                      ="info"; 
+    	global_log_verbosity                  ="medium";
+	hw_log_level                          ="info"; 
+    	hw_log_verbosity                      ="medium";
+	phy_log_level                         ="info"; 
+    	phy_log_verbosity                     ="medium";
+	mac_log_level                         ="info"; 
+    	mac_log_verbosity                     ="high";
+	rlc_log_level                         ="info"; 
+    	rlc_log_verbosity                     ="medium";
+	pdcp_log_level                        ="info"; 
+    	pdcp_log_verbosity                    ="medium";
+	rrc_log_level                         ="info"; 
+    	rrc_log_verbosity                     ="medium";
+   };	
+   
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
new file mode 100644
index 0000000000000000000000000000000000000000..9b052bf7ba9a888bb1b26cc8f654191513524982
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+    
+    cell_type =  "CELL_MACRO_ENB";
+    
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+    
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+    
+    mobile_country_code =  "208";
+    
+    mobile_network_code =  "92";
+    
+       ////////// Physical parameters:
+  
+    component_carriers = (
+    		       	 {
+  			   frame_type					      = "FDD";	
+                           tdd_config 					      = 3;
+                           tdd_config_s            			      = 0;
+ 			   prefix_type             			      = "NORMAL";
+  			   eutra_band              			      = 7;
+                           downlink_frequency      			      = 2660000000L;
+                           uplink_frequency_offset 			      = -120000000;
+  			   Nid_cell					      = 0;
+                           N_RB_DL                 			      = 25;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1; 
+			   tx_gain                                            = 60;
+			   rx_gain                                            = 111;
+                           prach_root              			      = 0;
+                           prach_config_index      			      = 0;
+                           prach_high_speed        			      = "DISABLE";
+  	                   prach_zero_correlation  			      = 1;
+                           prach_freq_offset       			      = 2;
+			   pucch_delta_shift       			      = 1;
+                           pucch_nRB_CQI           			      = 1;
+                           pucch_nCS_AN            			      = 0;
+                           pucch_n1_AN             			      = 32;
+                           pdsch_referenceSignalPower 			      = -29;
+                           pdsch_p_b                  			      = 0;
+                           pusch_n_SB                 			      = 1; 
+                           pusch_enable64QAM          			      = "DISABLE";
+			   pusch_hoppingMode                                  = "interSubFrame";
+			   pusch_hoppingOffset                                = 0;
+     	                   pusch_groupHoppingEnabled  			      = "ENABLE";
+	                   pusch_groupAssignment      			      = 0;
+	                   pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+	                   pusch_nDMRS1                                       = 1;
+	                   phich_duration                                     = "NORMAL";
+	                   phich_resource                                     = "ONESIXTH";
+	                   srs_enable                                         = "DISABLE";
+	               /*  srs_BandwidthConfig                                =;
+	                   srs_SubframeConfig                                 =;
+	                   srs_ackNackST                                      =;
+	                   srs_MaxUpPts                                       =;*/  
+
+	                   pusch_p0_Nominal                                   = -85; 
+	                   pusch_alpha                                        = "AL1";
+	                   pucch_p0_Nominal                                   = -96;
+	                   msg3_delta_Preamble                                = 6;
+	                   pucch_deltaF_Format1                               = "deltaF2";
+	                   pucch_deltaF_Format1b                              = "deltaF3";
+	                   pucch_deltaF_Format2                               = "deltaF0";
+	                   pucch_deltaF_Format2a                              = "deltaF0";
+  	                   pucch_deltaF_Format2b		    	      = "deltaF0";
+	
+                           rach_numberOfRA_Preambles                          = 64;
+                           rach_preamblesGroupAConfig                         = "DISABLE";
+/*
+                           rach_sizeOfRA_PreamblesGroupA                      = ;
+                           rach_messageSizeGroupA                             = ;
+                           rach_messagePowerOffsetGroupB                      = ; 
+*/
+                           rach_powerRampingStep                              = 4;
+	                   rach_preambleInitialReceivedTargetPower            = -100;
+                           rach_preambleTransMax                              = 10;
+	                   rach_raResponseWindowSize                          = 10;
+	                   rach_macContentionResolutionTimer                  = 48;
+	                   rach_maxHARQ_Msg3Tx                                = 4;
+
+			   pcch_default_PagingCycle                           = 128;
+			   pcch_nB                                            = "oneT";
+			   bcch_modificationPeriodCoeff			      = 2;
+			   ue_TimersAndConstants_t300			      = 1000;
+			   ue_TimersAndConstants_t301			      = 1000;
+			   ue_TimersAndConstants_t310			      = 1000;
+			   ue_TimersAndConstants_t311			      = 10000;
+			   ue_TimersAndConstants_n310			      = 20;
+			   ue_TimersAndConstants_n311			      = 1;
+
+			 }
+			 );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] 
+        timer_poll_retransmit    = 80;
+        
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+        
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+        
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+        
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+        
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+    
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.170";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+rrh_gw_config = (
+ {			  
+    local_if_name = "eth0";			  
+    #remote_address = "169.254.10.158";	
+    #local_address = "169.254.8.15";				  
+    remote_address = "74:d4:35:cc:88:45";
+    local_address = "d4:be:d9:22:0a:ac";
+    local_port = 50000;	    #for raw option local port must be the same to remote	       
+    remote_port = 50000; 
+    rrh_gw_active = "yes";
+    tr_preference = "raw";
+    rf_preference = "lmssdr";
+    iq_txshift = 0;
+    tx_sample_advance = 70;	
+    tx_scheduling_advance = 8; 	                
+                             
+}
+);  
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth6";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.118/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth6";
+
+
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.118/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..33db53740c08ec7048cc4d7de970720559ab9e3a
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "92";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2660000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 25;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 1;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 32;
+      pdsch_referenceSignalPower 			      = -29;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -90;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -96;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+rrh_gw_config = (
+ {			  
+    local_if_name = "eth0";			  
+    #remote_address = "169.254.10.158";	
+    #local_address = "169.254.8.15";				  
+    remote_address = "74:d4:35:cc:88:45";
+    local_address = "98:90:96:df:66:07";    
+    local_port = 50000;	#for raw option local port must be the same to remote	       
+    remote_port = 50000; 
+    rrh_gw_active = "yes";
+    tr_preference = "raw";
+    rf_preference = "usrp_b200";
+    iq_txshift = 5;
+    tx_sample_advance = 70;	
+    tx_scheduling_advance = 9; 	                
+                             
+}
+);  
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+
+
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf
index 375a4a90ca2ed11188fc6fc39f0d75ffdc0dbe6f..83b08cb4e0b50a409a26315331323627854b78ae 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf
@@ -16,7 +16,7 @@ eNBs =
     tracking_area_code  =  "1";
 
     mobile_country_code =  "208";
-    mobile_network_code =  "95";
+    mobile_network_code =  "92";
 
        ////////// Physical parameters:
 
@@ -35,7 +35,7 @@ eNBs =
         nb_antennas_tx          			      = 1;
         nb_antennas_rx          			      = 1;
         tx_gain                                            = 90;
-        rx_gain                                            = 132;
+        rx_gain                                            = 125;
         prach_root              			      = 0;
         prach_config_index      			      = 0;
         prach_high_speed        			      = "DISABLE";
@@ -130,18 +130,18 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( {ipv4 = "192.168.12.17";
+    mme_ip_address      = ( {ipv4 = "192.168.12.170";
                               ipv6="192:168:30::17";
                               active="yes";
                               preference="ipv4";});
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.213/24";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.242/24";
 
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.213/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.242/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
diff --git a/targets/RT/USER/UE_transport_IQ.c b/targets/RT/USER/UE_transport_IQ.c
index a52e3654aec845ab9666e7402fc0db65f2db81d1..a45b8ba43b40171e106689ea91ef32d90fdbb852 100644
--- a/targets/RT/USER/UE_transport_IQ.c
+++ b/targets/RT/USER/UE_transport_IQ.c
@@ -148,7 +148,7 @@ void *rrh_proc_UE_thread(void * arg) {
   unsigned int                  samples_per_frame=0;
   rrh_module_t 	*dev=(rrh_module_t *)arg;
   
-  samples_per_frame= dev->eth_dev.openair0_cfg.samples_per_frame;
+  samples_per_frame= dev->eth_dev.openair0_cfg->samples_per_frame;
   AssertFatal(samples_per_frame <=0, "invalide samples_per_frame !%u\n",samples_per_frame);
 
   time_req.tv_sec = 0;
@@ -260,7 +260,7 @@ void *rrh_UE_thread(void *arg) {
   void 			*tmp;
   unsigned int          samples_per_frame=0;
   
-  samples_per_frame= dev->eth_dev.openair0_cfg.samples_per_frame;
+  samples_per_frame= dev->eth_dev.openair0_cfg->samples_per_frame;
   time_req_1us.tv_sec = 0;
   time_req_1us.tv_nsec = 1000;
   
@@ -269,26 +269,26 @@ void *rrh_UE_thread(void *arg) {
     cmd=dev->eth_dev.trx_start_func(&dev->eth_dev);
     
     /* allocate memory for TX/RX buffers */
-    rx_buffer_UE = (int32_t**)malloc16(dev->eth_dev.openair0_cfg.rx_num_channels*sizeof(int32_t*));
-    tx_buffer_UE = (int32_t**)malloc16(dev->eth_dev.openair0_cfg.tx_num_channels*sizeof(int32_t*));
+    rx_buffer_UE = (int32_t**)malloc16(dev->eth_dev.openair0_cfg->rx_num_channels*sizeof(int32_t*));
+    tx_buffer_UE = (int32_t**)malloc16(dev->eth_dev.openair0_cfg->tx_num_channels*sizeof(int32_t*));
     
-    for (i=0; i<dev->eth_dev.openair0_cfg.rx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->rx_num_channels; i++) {
       tmp=(void *)malloc(sizeof(int32_t)*(samples_per_frame+4));
       memset(tmp,0,sizeof(int32_t)*(samples_per_frame+4));
       rx_buffer_UE[i]=(tmp+4*sizeof(int32_t));  
     }
     
-    for (i=0; i<dev->eth_dev.openair0_cfg.tx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->tx_num_channels; i++) {
       tmp=(void *)malloc(sizeof(int32_t)*(samples_per_frame+4));
       memset(tmp,0,sizeof(int32_t)*(samples_per_frame+4));
       tx_buffer_UE[i]=(tmp+4*sizeof(int32_t));  
     }
     
-    printf("Client %s:%d is connected (DL_RB=%d) rt=%d|%d. \n" ,   dev->eth_dev.openair0_cfg.remote_ip,
-	   dev->eth_dev.openair0_cfg.remote_port,
-	   dev->eth_dev.openair0_cfg.num_rb_dl,
-	   dev->eth_dev.openair0_cfg.rx_num_channels,
-	   dev->eth_dev.openair0_cfg.tx_num_channels);
+    printf("Client %s:%d is connected (DL_RB=%d) rt=%d|%d. \n" ,   dev->eth_dev.openair0_cfg->remote_addr,
+	   dev->eth_dev.openair0_cfg->remote_port,
+	   dev->eth_dev.openair0_cfg->num_rb_dl,
+	   dev->eth_dev.openair0_cfg->rx_num_channels,
+	   dev->eth_dev.openair0_cfg->tx_num_channels);
     
     if (cmd==START_CMD) {
       
@@ -348,8 +348,8 @@ void *rrh_UE_rx_thread(void *arg) {
   openair0_timestamp  temp, last_hw_counter=0;
   
   antenna_index     = 0;
-  nsamps	    = dev->eth_dev.openair0_cfg.samples_per_packet;
-  samples_per_frame = dev->eth_dev.openair0_cfg.samples_per_frame;
+  nsamps	    = dev->eth_dev.openair0_cfg->samples_per_packet;
+  samples_per_frame = dev->eth_dev.openair0_cfg->samples_per_frame;
   
   while (rrh_exit == 0) {
     if (!UE_rx_started) {
@@ -492,8 +492,8 @@ void *rrh_UE_tx_thread(void *arg) {
   unsigned int          samples_per_frame=0;
   
   antenna_index    = 0;
-  nsamps 	   = dev->eth_dev.openair0_cfg.samples_per_packet;
-  samples_per_frame = dev->eth_dev.openair0_cfg.samples_per_frame;
+  nsamps 	   = dev->eth_dev.openair0_cfg->samples_per_packet;
+  samples_per_frame = dev->eth_dev.openair0_cfg->samples_per_frame;
   
   
   while (rrh_exit == 0) {
diff --git a/targets/RT/USER/eNB_transport_IQ.c b/targets/RT/USER/eNB_transport_IQ.c
index af3873ef76cfd4b940988333c93f4c9d586f5fb7..acb382386e4ef680414d69a55416498eee5ebb87 100644
--- a/targets/RT/USER/eNB_transport_IQ.c
+++ b/targets/RT/USER/eNB_transport_IQ.c
@@ -127,7 +127,7 @@ static void check_dev_config( rrh_module_t *mod_enb);
  * \note
  * @ingroup  _oai
  */
-static void calc_rt_period_ns( openair0_config_t openair0_cfg);
+static void calc_rt_period_ns( openair0_config_t *openair0_cfg);
 
 
 
@@ -140,104 +140,37 @@ void config_BBU_mod( rrh_module_t *mod_enb, uint8_t RT_flag, uint8_t NRT_flag) {
   
   RT_flag_eNB=RT_flag;
   NRT_flag_eNB=NRT_flag;
-    
-  /* handshake with client to exchange parameters */
+  
+  /* init socket and have handshake-like msg with client to exchange parameters */
   mod_enb->eth_dev.trx_start_func(&mod_enb->eth_dev);//change port  make it plus_id
- 
- /* if a RF iterface is added to RRH module get the  configuration parameters sent from eNB  */
-  if (mod_enb->devs->type != NONE_IF ) {  
 
-    memcpy((void*)&mod_enb->devs->openair0_cfg,(void *)&mod_enb->eth_dev.openair0_cfg,sizeof(openair0_config_t));
-    
-    /* certain parameters have to be updated (calibration related)*/
-    if ( mod_enb->devs->type == EXMIMO_IF ) {
-      if ( mod_enb->devs->openair0_cfg.num_rb_dl == 100 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 175;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 50 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 95;
-	mod_enb->devs->openair0_cfg.tx_delay = 5;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 25 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 1024;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 70;
-	mod_enb->devs->openair0_cfg.tx_delay = 6;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 6 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 256;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 40;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }
-    }
-    else if ((mod_enb->devs->type == USRP_B200_IF )||(mod_enb->devs->type == USRP_X300_IF )) {
-      if ( mod_enb->devs->openair0_cfg.num_rb_dl == 100 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 175;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 50 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 95;
-	mod_enb->devs->openair0_cfg.tx_delay = 5;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 25 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 1024;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 70;
-	mod_enb->devs->openair0_cfg.tx_delay = 6;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 6 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 256;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 40;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }
-    }
-    else if(mod_enb->devs->type == BLADERF_IF) {
-      if ( mod_enb->devs->openair0_cfg.num_rb_dl == 100 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 175;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 50 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 2048;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 95;
-	mod_enb->devs->openair0_cfg.tx_delay = 5;
-      }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 25 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 1024;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 70;
-	mod_enb->devs->openair0_cfg.tx_delay = 6;
+  mod_enb->devs->openair0_cfg = mod_enb->eth_dev.openair0_cfg;
+
+  /* check sanity of configuration parameters and print */
+  check_dev_config(mod_enb);  
+  if (rf_config_file[0] == '\0')  
+    mod_enb->devs->openair0_cfg->configFilename = NULL;
+  else
+    mod_enb->devs->openair0_cfg->configFilename = rf_config_file;
+  /* initialize and configure the RF device */
+  if (openair0_device_load(mod_enb->devs, mod_enb->devs->openair0_cfg)<0) {
+    LOG_E(RRH,"Exiting, cannot initialize RF device.\n");
+    exit(-1);
+  } else {   
+    if (mod_enb->devs->type != NONE_DEV) {
+      /* start RF device */
+      if (mod_enb->devs->type == EXMIMO_DEV) {
+	//call start function for exmino
+      } else {
+
+	if (mod_enb->devs->trx_start_func(mod_enb->devs)!=0)
+	  LOG_E(RRH,"Unable to initiate RF device.\n");
+	else
+	  LOG_I(RRH,"RF device has been initiated.\n");
       }
-      else if ( mod_enb->devs->openair0_cfg.num_rb_dl == 6 ) {
-	mod_enb->devs->openair0_cfg.samples_per_packet = 256;
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps = 40;
-	mod_enb->devs->openair0_cfg.tx_delay = 8;
-      }           
-    }  
-    
-    /* check sanity of configuration parameters and print */
-    check_dev_config(mod_enb);    
-    
-    /* initialize and configure the RF device */
-    if (openair0_device_init(mod_enb->devs, &mod_enb->devs->openair0_cfg)<0){
-      LOG_E(RRH,"Exiting, cannot initialize RF device.\n");
-      exit(-1);
-    }
-    else {
-      LOG_I(RRH,"RF device has been successfully initialized.\n");
-    }    
-
-    /* start RF device */
-    if (mod_enb->devs->type == EXMIMO_IF ) {
       
-    } else {
-      if (mod_enb->devs->trx_start_func(mod_enb->devs)!=0)
-	LOG_E(RRH,"Unable to initiate RF device.\n");
     }
-    LOG_I(RRH,"RF device has been initiated.\n");
-  }
+  }  
   
   /* create main eNB module thread
      main_rrh_eNB_thread allocates memory 
@@ -266,7 +199,7 @@ void *rrh_eNB_thread(void *arg) {
   void 			*tmp;
   unsigned int          samples_per_frame=0;
   
-  samples_per_frame = dev->eth_dev.openair0_cfg.samples_per_frame;    
+  samples_per_frame = dev->eth_dev.openair0_cfg->samples_per_frame;    
 
   while (rrh_exit==0) {
     
@@ -278,42 +211,42 @@ void *rrh_eNB_thread(void *arg) {
     /* allocate memory for TX/RX buffers
        each antenna port has a TX and a RX buffer
        each TX and RX buffer is of (samples_per_frame + HEADER_SIZE) samples (size of samples is 4 bytes) */
-    rx_buffer_eNB = (int32_t**)malloc16(dev->eth_dev.openair0_cfg.rx_num_channels*sizeof(int32_t*));
-    tx_buffer_eNB = (int32_t**)malloc16(dev->eth_dev.openair0_cfg.tx_num_channels*sizeof(int32_t*));    
+    rx_buffer_eNB = (int32_t**)malloc16(dev->eth_dev.openair0_cfg->rx_num_channels*sizeof(int32_t*));
+    tx_buffer_eNB = (int32_t**)malloc16(dev->eth_dev.openair0_cfg->tx_num_channels*sizeof(int32_t*));    
     LOG_D(RRH,"rx_buffer_eNB address =%p tx_buffer_eNB address =%p  \n",rx_buffer_eNB,tx_buffer_eNB);
     
     /* rx_buffer_eNB points to the beginning of data */
-    for (i=0; i<dev->eth_dev.openair0_cfg.rx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->rx_num_channels; i++) {
       tmp=(void *)malloc16(sizeof(int32_t)*(samples_per_frame + 32));
       memset(tmp,0,sizeof(int32_t)*(samples_per_frame + 32));
       rx_buffer_eNB[i]=( tmp + (32*sizeof(int32_t)) );  
       LOG_D(RRH,"i=%d rx_buffer_eNB[i]=%p tmp= %p\n",i,rx_buffer_eNB[i],tmp);
     }
     /* tx_buffer_eNB points to the beginning of data */
-    for (i=0; i<dev->eth_dev.openair0_cfg.tx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->tx_num_channels; i++) {
       tmp=(void *)malloc16(sizeof(int32_t)*(samples_per_frame + 32));
       memset(tmp,0,sizeof(int32_t)*(samples_per_frame + 32));
       tx_buffer_eNB[i]=( tmp + (32*sizeof(int32_t)) );  
       LOG_D(RRH,"i= %d tx_buffer_eNB[i]=%p tmp= %p \n",i,tx_buffer_eNB[i],tmp);
     }
     /* dummy initialization for TX/RX buffers */
-    for (i=0; i<dev->eth_dev.openair0_cfg.rx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->rx_num_channels; i++) {
       for (j=0; j<samples_per_frame; j++) {
 	rx_buffer_eNB[i][j]=32+i; 
       } 
     }
     /* dummy initialization for TX/RX buffers */
-    for (i=0; i<dev->eth_dev.openair0_cfg.tx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->tx_num_channels; i++) {
       for (j=0; j<samples_per_frame; j++) {
 	tx_buffer_eNB[i][j]=12+i; 
       } 
     }    
     /* allocate TX/RX buffers pointers used in write/read operations */
-    rx_eNB = (void**)malloc16(dev->eth_dev.openair0_cfg.rx_num_channels*sizeof(int32_t*));
-    tx_eNB = (void**)malloc16(dev->eth_dev.openair0_cfg.tx_num_channels*sizeof(int32_t*));
+    rx_eNB = (void**)malloc16(dev->eth_dev.openair0_cfg->rx_num_channels*sizeof(int32_t*));
+    tx_eNB = (void**)malloc16(dev->eth_dev.openair0_cfg->tx_num_channels*sizeof(int32_t*));
 
     /* init mutexes */    
-    for (i=0; i<dev->eth_dev.openair0_cfg.tx_num_channels; i++) {
+    for (i=0; i<dev->eth_dev.openair0_cfg->tx_num_channels; i++) {
       pthread_mutex_init(&sync_eNB_mutex[i],NULL);
       pthread_cond_init(&sync_eNB_cond[i],NULL);
     }
@@ -353,7 +286,7 @@ void *rrh_eNB_thread(void *arg) {
     }
    
     /* create timer thread; when no RF device is present a software clock is generated */    
-    if (dev->devs->type == NONE_IF) {
+    if (dev->devs->type == NONE_DEV) {
 
       int 			error_code_timer;
       pthread_t 		main_timer_proc_thread;
@@ -405,10 +338,11 @@ void *rrh_eNB_thread(void *arg) {
   return(0);
 }
 
+/* Receive from RF and transmit to RRH */
 
 void *rrh_eNB_rx_thread(void *arg) {
 
-  /* measuremnt related vars */
+  /* measurement related vars */
   struct timespec time0,time1,time2;
   unsigned long long max_rx_time=0, min_rx_time=rt_period, total_rx_time=0, average_rx_time=rt_period, s_period=0, trial=0;
   int trace_cnt=0;
@@ -425,10 +359,10 @@ void *rrh_eNB_rx_thread(void *arg) {
 
   time_req_1us.tv_sec = 0;
   time_req_1us.tv_nsec =1000;  //time_req_1us.tv_nsec = (int)rt_period/2;--->granularity issue
-  spp_eth =  dev->eth_dev.openair0_cfg.samples_per_packet;
-  spp_rf  =  dev->devs->openair0_cfg.samples_per_packet;
+  spp_eth =  dev->eth_dev.openair0_cfg->samples_per_packet;
+  spp_rf  =  dev->devs->openair0_cfg->samples_per_packet;
 
-  samples_per_frame = dev->eth_dev.openair0_cfg.samples_per_frame;
+  samples_per_frame = dev->eth_dev.openair0_cfg->samples_per_frame;
   samples_per_subframe = (unsigned int)samples_per_frame/10;
   loopback = dev->loopback;
   measurements = dev->measurements;
@@ -456,14 +390,14 @@ void *rrh_eNB_rx_thread(void *arg) {
 
   while (rrh_exit == 0) {    
     while (rx_pos <(1 + subframe)*samples_per_subframe) {
-      LOG_D(RRH,"starting a new send:%d  %d\n",sync_trx,frame);
+      //LOG_D(RRH,"starting a new send:%d  %d\n",sync_trx,frame);
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_RX, 1 );
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME_RX, frame);
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_SUBFRAME_RX, subframe );  
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RX_PCK, pck_rx );
       LOG_D(RRH,"pack=%d    rx_pos=%d    subframe=%d frame=%d\n ",pck_rx, rx_pos, subframe,frame);
       
-      if (dev->devs->type == NONE_IF) {	
+      if (dev->devs->type == NONE_DEV) {	
 	VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RX_HWCNT, hw_counter );
 	VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RX_LHWCNT, last_hw_counter );
 	VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_CNT, s_cnt );
@@ -501,19 +435,19 @@ void *rrh_eNB_rx_thread(void *arg) {
 	}
        }
        
-       for (i=0; i<dev->eth_dev.openair0_cfg.rx_num_channels; i++) {
+       for (i=0; i<dev->eth_dev.openair0_cfg->rx_num_channels; i++) {
 	 rx_eNB[i] = (void*)&rx_buffer_eNB[i][rx_pos];
 	 LOG_D(RRH," rx_eNB[i]=%p rx_buffer_eNB[i][rx_pos]=%p ,rx_pos=%d, i=%d ts=%d\n",rx_eNB[i],&rx_buffer_eNB[i][rx_pos],rx_pos,i,timestamp_rx);	 
        }  
        VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RXCNT, rx_pos );
-       if (dev->devs->type != NONE_IF) {
+       if (dev->devs->type != NONE_DEV) {
 	 VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ_RF, 1 ); 
 	 /* Read operation to RF device (RX)*/
 	 if ( dev->devs->trx_read_func (dev->devs,
 					&timestamp_rx,
 					rx_eNB,
 					spp_rf,
-					dev->devs->openair0_cfg.rx_num_channels
+					dev->devs->openair0_cfg->rx_num_channels
 					)<0) {
 	   perror("RRH eNB : USRP read");
 	 }
@@ -526,14 +460,14 @@ void *rrh_eNB_rx_thread(void *arg) {
 						      timestamp_rx,
 						      rx_eNB,
 						      spp_eth,
-						      dev->eth_dev.openair0_cfg.rx_num_channels,
+						      dev->eth_dev.openair0_cfg->rx_num_channels,
 						      0))<0) {
 	 perror("RRH eNB : ETHERNET write");
        }    
        VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
 
        /* when there is no RF timestamp is updated by number of samples */
-       if (dev->devs->type == NONE_IF) {
+       if (dev->devs->type == NONE_DEV) {
 	 timestamp_rx+=spp_eth;
 	 last_hw_counter=hw_counter;
        }
@@ -559,7 +493,7 @@ void *rrh_eNB_rx_thread(void *arg) {
 	   }
 	   if (s_period++ == PRINTF_PERIOD) {
 	     s_period=0;
-	     LOG_I(RRH,"Average eNB RX time : %lu\tMax RX time : %lu\tMin RX time : %lu\n",average_rx_time,max_rx_time,min_rx_time);
+	     LOG_I(RRH,"Average eNB RX time : %lu ns\tMax RX time : %lu ns\tMin RXX time : %lu ns\n",average_rx_time,max_rx_time,min_rx_time);
 	   }
 	 }
 	 
@@ -577,7 +511,7 @@ void *rrh_eNB_rx_thread(void *arg) {
        next_rx_pos=(rx_pos+spp_eth);
        
        VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_RX, 0 );
-       /**/
+       /*
        if (frame>50) {
 	 pthread_mutex_lock(&sync_trx_mutex);
 	 while (sync_trx) {
@@ -587,7 +521,7 @@ void *rrh_eNB_rx_thread(void *arg) {
 	 LOG_D(RRH,"out of while send:%d  %d\n",sync_trx,frame);
 	 pthread_cond_signal(&sync_trx_cond);
 	 pthread_mutex_unlock(&sync_trx_mutex);
-       }
+	 }*/
     } // while 
     
     subframe++;
@@ -609,6 +543,7 @@ void *rrh_eNB_rx_thread(void *arg) {
   return 0;
 }
 
+/* Receive from eNB and transmit to RF */
 
 void *rrh_eNB_tx_thread(void *arg) {
 
@@ -647,60 +582,34 @@ void *rrh_eNB_tx_thread(void *arg) {
   
   time_req_1us.tv_sec = 1;
   time_req_1us.tv_nsec = 0;
-  spp_eth = dev->eth_dev.openair0_cfg.samples_per_packet;
-  spp_rf =  dev->devs->openair0_cfg.samples_per_packet;
-  samples_per_frame = dev->eth_dev.openair0_cfg.samples_per_frame;
+  spp_eth = dev->eth_dev.openair0_cfg->samples_per_packet;
+  spp_rf =  dev->devs->openair0_cfg->samples_per_packet;
+  samples_per_frame = dev->eth_dev.openair0_cfg->samples_per_frame;
   samples_per_subframe = (unsigned int)samples_per_frame/10;
   tx_pos=0;
-  //tx_pos_rf=spp_rf*dev->devs->openair0_cfg.tx_delay;
-  
+
   loopback = dev->loopback;
   measurements = dev->measurements;
   
   while (rrh_exit == 0) {     
     while (tx_pos < (1 + subframe)*samples_per_subframe) {
       
-      LOG_D(RRH,"bef lock read:%d  %d\n",sync_trx,frame);
-      pthread_mutex_lock(&sync_trx_mutex);
+      //LOG_D(RRH,"bef lock read:%d  %d\n",sync_trx,frame);
+      //pthread_mutex_lock(&sync_trx_mutex);
       
-      while (!sync_trx) {
-	LOG_D(RRH,"in sync read:%d  %d\n",sync_trx,frame);
-	pthread_cond_wait(&sync_trx_cond,&sync_trx_mutex);
-      }
-      LOG_D(RRH,"out of while read:%d  %d\n",sync_trx,frame);
+      //while (!sync_trx) {
+      //LOG_D(RRH,"in sync read:%d  %d\n",sync_trx,frame);
+      //pthread_cond_wait(&sync_trx_cond,&sync_trx_mutex);
+      //}
+      //LOG_D(RRH,"out of while read:%d  %d\n",sync_trx,frame);
       
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX, 1 );
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME, frame);
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_SUBFRAME, subframe );
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TX_PCK, pck_tx );
-      
-      /*	
-		if (dev->devs->type == NONE_IF) {  
-		VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TX_HWCNT, hw_counter );
-		VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TX_LHWCNT, last_hw_counter );    
-		
-		if (!eNB_tx_started) {
-		eNB_tx_started=1; // set this flag to 1 to indicate that eNB started
-		if (RT_flag_eNB==1) {
-		last_hw_counter=hw_counter;
-		}
-		} else {
-		if (RT_flag_eNB==1) {
-		if (hw_counter > last_hw_counter+1) {
-		printf("LT");
-		} else {
-		while ((hw_counter < last_hw_counter+1)) {
-		VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX_SLEEP, 1 );
-		nanosleep(&time_req_1us,&time_rem_1us);
-		VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX_SLEEP, 0 );
-		}
-		}
-		}
-		}
-		}    */
-      
+          
       if (measurements == 1 ) 	clock_gettime(CLOCK_MONOTONIC,&time1); 
-      for (i=0; i<dev->eth_dev.openair0_cfg.tx_num_channels; i++) tx_eNB[i] = (void*)&tx_buffer_eNB[i][tx_pos];	//RF!!!!!		
+      for (i=0; i<dev->eth_dev.openair0_cfg->tx_num_channels; i++) tx_eNB[i] = (void*)&tx_buffer_eNB[i][tx_pos];		
       
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TXCNT, tx_pos );
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
@@ -710,12 +619,12 @@ void *rrh_eNB_tx_thread(void *arg) {
 							&timestamp_tx,
 							tx_eNB,
 							spp_eth,
-							dev->eth_dev.openair0_cfg.tx_num_channels))<0) {
+							dev->eth_dev.openair0_cfg->tx_num_channels))<0) {
 	perror("RRH eNB : ETHERNET read");
       }		
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );	
       
-      if (dev->devs->type != NONE_IF) {  
+      if (dev->devs->type != NONE_DEV) {  
 	LOG_D(RRH," tx_buffer_eNB[i][tx_pos]=%x t_buffer_eNB[i][tx_pos+1]=%x t_buffer_eNB[i][tx_pos+2]=%x \n",tx_buffer_eNB[0][tx_pos],tx_buffer_eNB[0][tx_pos+1],tx_buffer_eNB[0][tx_pos+2]);	 
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_RF, 1 );    
 	/* Write operation to RF device (TX)*/
@@ -723,8 +632,8 @@ void *rrh_eNB_tx_thread(void *arg) {
 					timestamp_tx,
 					tx_eNB,
 					spp_rf,
-					dev->devs->openair0_cfg.tx_num_channels,
-					0)<0){
+					dev->devs->openair0_cfg->tx_num_channels,
+					1)<0){
 	  perror("RRH eNB : USRP write");
 	}
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_RF, 0 );
@@ -733,7 +642,7 @@ void *rrh_eNB_tx_thread(void *arg) {
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TX_TS, timestamp_tx&0xffffffff ); 
       
             
-      if (dev->devs->type == NONE_IF)	last_hw_counter=hw_counter;
+      if (dev->devs->type == NONE_DEV)	last_hw_counter=hw_counter;
     
     
       if (loopback ==1 ) { 
@@ -754,10 +663,10 @@ void *rrh_eNB_tx_thread(void *arg) {
       tx_pos += spp_eth;
       pck_tx++;   
       
-      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX, 0 );
-      sync_trx=0;
-      pthread_cond_signal(&sync_trx_cond);
-      pthread_mutex_unlock(&sync_trx_mutex);
+      //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX, 0 );
+      //sync_trx=0;
+      //pthread_cond_signal(&sync_trx_cond);
+      //pthread_mutex_unlock(&sync_trx_mutex);
     }
 
     /* wrap around tx buffer index */
@@ -775,72 +684,67 @@ void *rrh_eNB_tx_thread(void *arg) {
 }
 
 
-static void calc_rt_period_ns( openair0_config_t openair0_cfg) {
+static void calc_rt_period_ns( openair0_config_t *openair0_cfg) {
 
-  rt_period= (double)(openair0_cfg.samples_per_packet/(openair0_cfg.samples_per_frame/10.0)*1000000);
+  rt_period= (double)(openair0_cfg->samples_per_packet/(openair0_cfg->samples_per_frame/10.0)*1000000);
   AssertFatal(rt_period > 0, "Invalid rt period !%u\n", rt_period);
   LOG_I(RRH,"[eNB] Real time period is set to %u ns\n", rt_period);	
 }
 
 
 static void check_dev_config( rrh_module_t *mod_enb) {
-  
-  
-  AssertFatal( (mod_enb->devs->openair0_cfg.num_rb_dl==100 || mod_enb->devs->openair0_cfg.num_rb_dl==50 || mod_enb->devs->openair0_cfg.num_rb_dl==25 || mod_enb->devs->openair0_cfg.num_rb_dl==6) , "Invalid number of resource blocks! %d\n", mod_enb->devs->openair0_cfg.num_rb_dl);
- AssertFatal( mod_enb->devs->openair0_cfg.samples_per_frame  > 0 ,  "Invalid number of samples per frame! %d\n",mod_enb->devs->openair0_cfg.samples_per_frame); 
- AssertFatal( mod_enb->devs->openair0_cfg.sample_rate        > 0.0, "Invalid sample rate! %f\n", mod_enb->devs->openair0_cfg.sample_rate);
- AssertFatal( mod_enb->devs->openair0_cfg.samples_per_packet > 0 ,  "Invalid number of samples per packet! %d\n",mod_enb->devs->openair0_cfg.samples_per_packet);
- AssertFatal( mod_enb->devs->openair0_cfg.rx_num_channels    > 0 ,  "Invalid number of RX antennas! %d\n", mod_enb->devs->openair0_cfg.rx_num_channels); 
- AssertFatal( mod_enb->devs->openair0_cfg.tx_num_channels    > 0 ,  "Invalid number of TX antennas! %d\n", mod_enb->devs->openair0_cfg.tx_num_channels);
- AssertFatal( mod_enb->devs->openair0_cfg.rx_freq[0]         > 0.0 ,"Invalid RX frequency! %f\n", mod_enb->devs->openair0_cfg.rx_freq[0]); 
- AssertFatal( mod_enb->devs->openair0_cfg.tx_freq[0]         > 0.0 ,"Invalid TX frequency! %f\n", mod_enb->devs->openair0_cfg.tx_freq[0]);
- AssertFatal( mod_enb->devs->openair0_cfg.rx_gain[0]         > 0.0 ,"Invalid RX gain! %f\n", mod_enb->devs->openair0_cfg.rx_gain[0]); 
- AssertFatal( mod_enb->devs->openair0_cfg.tx_gain[0]         > 0.0 ,"Invalid TX gain! %f\n", mod_enb->devs->openair0_cfg.tx_gain[0]);
- AssertFatal( mod_enb->devs->openair0_cfg.rx_bw              > 0.0 ,"Invalid RX bw! %f\n", mod_enb->devs->openair0_cfg.rx_bw); 
- AssertFatal( mod_enb->devs->openair0_cfg.tx_bw              > 0.0 ,"Invalid RX bw! %f\n", mod_enb->devs->openair0_cfg.tx_bw);
- AssertFatal( mod_enb->devs->openair0_cfg.autocal[0]         > 0 ,  "Invalid auto calibration choice! %d\n", mod_enb->devs->openair0_cfg.autocal[0]);
+    
+ AssertFatal( (mod_enb->devs->openair0_cfg->num_rb_dl==100 || mod_enb->devs->openair0_cfg->num_rb_dl==50 || mod_enb->devs->openair0_cfg->num_rb_dl==25 || mod_enb->devs->openair0_cfg->num_rb_dl==6) , "Invalid number of resource blocks! %d\n", mod_enb->devs->openair0_cfg->num_rb_dl);
+ AssertFatal( mod_enb->devs->openair0_cfg->samples_per_frame  > 0 ,  "Invalid number of samples per frame! %d\n",mod_enb->devs->openair0_cfg->samples_per_frame); 
+ AssertFatal( mod_enb->devs->openair0_cfg->sample_rate        > 0.0, "Invalid sample rate! %f\n", mod_enb->devs->openair0_cfg->sample_rate);
+ AssertFatal( mod_enb->devs->openair0_cfg->samples_per_packet > 0 ,  "Invalid number of samples per packet! %d\n",mod_enb->devs->openair0_cfg->samples_per_packet);
+ AssertFatal( mod_enb->devs->openair0_cfg->rx_num_channels    > 0 ,  "Invalid number of RX antennas! %d\n", mod_enb->devs->openair0_cfg->rx_num_channels); 
+ AssertFatal( mod_enb->devs->openair0_cfg->tx_num_channels    > 0 ,  "Invalid number of TX antennas! %d\n", mod_enb->devs->openair0_cfg->tx_num_channels);
+ AssertFatal( mod_enb->devs->openair0_cfg->rx_freq[0]         > 0.0 ,"Invalid RX frequency! %f\n", mod_enb->devs->openair0_cfg->rx_freq[0]); 
+ AssertFatal( mod_enb->devs->openair0_cfg->tx_freq[0]         > 0.0 ,"Invalid TX frequency! %f\n", mod_enb->devs->openair0_cfg->tx_freq[0]);
+ AssertFatal( mod_enb->devs->openair0_cfg->rx_gain[0]         > 0.0 ,"Invalid RX gain! %f\n", mod_enb->devs->openair0_cfg->rx_gain[0]); 
+ AssertFatal( mod_enb->devs->openair0_cfg->tx_gain[0]         > 0.0 ,"Invalid TX gain! %f\n", mod_enb->devs->openair0_cfg->tx_gain[0]);
+ AssertFatal( mod_enb->devs->openair0_cfg->rx_bw              > 0.0 ,"Invalid RX bw! %f\n", mod_enb->devs->openair0_cfg->rx_bw); 
+ AssertFatal( mod_enb->devs->openair0_cfg->tx_bw              > 0.0 ,"Invalid RX bw! %f\n", mod_enb->devs->openair0_cfg->tx_bw);
+ AssertFatal( mod_enb->devs->openair0_cfg->autocal[0]         > 0 ,  "Invalid auto calibration choice! %d\n", mod_enb->devs->openair0_cfg->autocal[0]);
  
  printf("\n---------------------RF device configuration parameters---------------------\n");
  
- printf("\tMod_id=%d\n \tlog level=%d\n \tDL_RB=%d\n \tsamples_per_frame=%d\n \tsample_rate=%f\n \tsamples_per_packet=%d\n \ttx_delay=%d\n \ttx_forward_nsamps=%d\n \trx_num_channels=%d\n \ttx_num_channels=%d\n \trx_freq_0=%f\n \ttx_freq_0=%f\n \trx_freq_1=%f\n \ttx_freq_1=%f\n \trx_freq_2=%f\n \ttx_freq_2=%f\n \trx_freq_3=%f\n \ttx_freq_3=%f\n \trxg_mode=%d\n \trx_gain_0=%f\n \ttx_gain_0=%f\n  \trx_gain_1=%f\n \ttx_gain_1=%f\n  \trx_gain_2=%f\n \ttx_gain_2=%f\n  \trx_gain_3=%f\n \ttx_gain_3=%f\n \trx_gain_offset_2=%f\n \ttx_gain_offset_3=%f\n  \trx_bw=%f\n \ttx_bw=%f\n \tautocal=%d\n \trem_addr %s:%d\n \tmy_addr %s:%d\n",	
-	mod_enb->devs->openair0_cfg.Mod_id,
-	mod_enb->devs->openair0_cfg.log_level,
-	mod_enb->devs->openair0_cfg.num_rb_dl,
-	mod_enb->devs->openair0_cfg.samples_per_frame,
-	mod_enb->devs->openair0_cfg.sample_rate,
-	mod_enb->devs->openair0_cfg.samples_per_packet,
-	mod_enb->devs->openair0_cfg.tx_delay,
-	mod_enb->devs->openair0_cfg.tx_forward_nsamps,
-	mod_enb->devs->openair0_cfg.rx_num_channels,
-	mod_enb->devs->openair0_cfg.tx_num_channels,
-	mod_enb->devs->openair0_cfg.rx_freq[0],
-	mod_enb->devs->openair0_cfg.tx_freq[0],
-	mod_enb->devs->openair0_cfg.rx_freq[1],
-	mod_enb->devs->openair0_cfg.tx_freq[1],
-	mod_enb->devs->openair0_cfg.rx_freq[2],
-	mod_enb->devs->openair0_cfg.tx_freq[2],
-	mod_enb->devs->openair0_cfg.rx_freq[3],
-	mod_enb->devs->openair0_cfg.tx_freq[3],
-	mod_enb->devs->openair0_cfg.rxg_mode[0],
-	mod_enb->devs->openair0_cfg.rx_gain[0],
-	mod_enb->devs->openair0_cfg.tx_gain[0],
-	mod_enb->devs->openair0_cfg.rx_gain[1],
-	mod_enb->devs->openair0_cfg.tx_gain[1],
-	mod_enb->devs->openair0_cfg.rx_gain[2],
-	mod_enb->devs->openair0_cfg.tx_gain[2],
-	mod_enb->devs->openair0_cfg.rx_gain[3],
-	mod_enb->devs->openair0_cfg.tx_gain[3],
-	//mod_enb->devs->openair0_cfg.rx_gain_offset[0],
-	//mod_enb->devs->openair0_cfg.rx_gain_offset[1],
-	mod_enb->devs->openair0_cfg.rx_gain_offset[2],
-	mod_enb->devs->openair0_cfg.rx_gain_offset[3],
-	mod_enb->devs->openair0_cfg.rx_bw,
-	mod_enb->devs->openair0_cfg.tx_bw,
-	mod_enb->devs->openair0_cfg.autocal[0],
-	mod_enb->devs->openair0_cfg.remote_ip,
-	mod_enb->devs->openair0_cfg.remote_port,
-	mod_enb->devs->openair0_cfg.my_ip,
-	mod_enb->devs->openair0_cfg.my_port  
+ printf("\tMod_id=%d\n \tlog level=%d\n \tDL_RB=%d\n \tsamples_per_frame=%d\n \tsample_rate=%f\n \tsamples_per_packet=%d\n \ttx_scheduling_advance=%d\n \ttx_sample_advance=%d\n \trx_num_channels=%d\n \ttx_num_channels=%d\n \trx_freq_0=%f\n \ttx_freq_0=%f\n \trx_freq_1=%f\n \ttx_freq_1=%f\n \trx_freq_2=%f\n \ttx_freq_2=%f\n \trx_freq_3=%f\n \ttx_freq_3=%f\n \trxg_mode=%d\n \trx_gain_0=%f\n \ttx_gain_0=%f\n  \trx_gain_1=%f\n \ttx_gain_1=%f\n  \trx_gain_2=%f\n \ttx_gain_2=%f\n  \trx_gain_3=%f\n \ttx_gain_3=%f\n \trx_gain_offset_2=%f\n \ttx_gain_offset_3=%f\n  \trx_bw=%f\n \ttx_bw=%f\n \tautocal=%d\n",	
+	mod_enb->devs->openair0_cfg->Mod_id,
+	mod_enb->devs->openair0_cfg->log_level,
+	mod_enb->devs->openair0_cfg->num_rb_dl,
+	mod_enb->devs->openair0_cfg->samples_per_frame,
+	mod_enb->devs->openair0_cfg->sample_rate,
+	mod_enb->devs->openair0_cfg->samples_per_packet,
+	mod_enb->devs->openair0_cfg->tx_scheduling_advance,
+	mod_enb->devs->openair0_cfg->tx_sample_advance,
+	mod_enb->devs->openair0_cfg->rx_num_channels,
+	mod_enb->devs->openair0_cfg->tx_num_channels,
+	mod_enb->devs->openair0_cfg->rx_freq[0],
+	mod_enb->devs->openair0_cfg->tx_freq[0],
+	mod_enb->devs->openair0_cfg->rx_freq[1],
+	mod_enb->devs->openair0_cfg->tx_freq[1],
+	mod_enb->devs->openair0_cfg->rx_freq[2],
+	mod_enb->devs->openair0_cfg->tx_freq[2],
+	mod_enb->devs->openair0_cfg->rx_freq[3],
+	mod_enb->devs->openair0_cfg->tx_freq[3],
+	mod_enb->devs->openair0_cfg->rxg_mode[0],
+	mod_enb->devs->openair0_cfg->tx_gain[0],
+	mod_enb->devs->openair0_cfg->tx_gain[0],
+	mod_enb->devs->openair0_cfg->rx_gain[1],
+	mod_enb->devs->openair0_cfg->tx_gain[1],
+	mod_enb->devs->openair0_cfg->rx_gain[2],
+	mod_enb->devs->openair0_cfg->tx_gain[2],
+	mod_enb->devs->openair0_cfg->rx_gain[3],
+	mod_enb->devs->openair0_cfg->tx_gain[3],
+	//mod_enb->devs->openair0_cfg->rx_gain_offset[0],
+	//mod_enb->devs->openair0_cfg->rx_gain_offset[1],
+	mod_enb->devs->openair0_cfg->rx_gain_offset[2],
+	mod_enb->devs->openair0_cfg->rx_gain_offset[3],
+	mod_enb->devs->openair0_cfg->rx_bw,
+	mod_enb->devs->openair0_cfg->tx_bw,
+	mod_enb->devs->openair0_cfg->autocal[0]  
 	);
  
  printf("----------------------------------------------------------------------------\n");
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index a609863550748c0c659cc2efcf27b4071d79c8ac..8f1ed46edb47f60640e777fbbe19bff56548980d 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -290,6 +290,8 @@ double bw = 10.0e6;
 
 static int                      tx_max_power[MAX_NUM_CCs]; /* =  {0,0}*/;
 
+char   rf_config_file[1024];
+
 int chain_offset=0;
 
 #ifndef EXMIMO
@@ -330,7 +332,6 @@ void reset_opp_meas(void);
 void print_opp_meas(void);
 int transmission_mode=1;
 
-
 int16_t           glog_level         = LOG_INFO;
 int16_t           glog_verbosity     = LOG_MED;
 int16_t           hw_log_level       = LOG_INFO;
@@ -361,16 +362,60 @@ int16_t           osa_log_verbosity  = LOG_MED;
 
 
 #ifdef ETHERNET
-char rrh_eNB_ip[20] = "127.0.0.1";
-int rrh_eNB_port = 50000;
 char *rrh_UE_ip = "127.0.0.1";
 int rrh_UE_port = 51000;
 #endif
 
+/* flag set by eNB conf file to specify if the radio head is local or remote (default option is local) */
+uint8_t local_remote_radio = BBU_LOCAL_RADIO_HEAD;
+/* struct for ethernet specific parameters given in eNB conf file */
+eth_params_t *eth_params;
+
 char uecap_xer[1024],uecap_xer_in=0;
 extern void *UE_thread(void *arg);
 extern void init_UE_threads(void);
 
+/*---------------------BMC: timespec helpers -----------------------------*/
+
+struct timespec min_diff_time = { .tv_sec = 0, .tv_nsec = 0 };
+struct timespec max_diff_time = { .tv_sec = 0, .tv_nsec = 0 };
+
+struct timespec clock_difftime(struct timespec start, struct timespec end)
+{
+    struct timespec temp;
+    if ((end.tv_nsec-start.tv_nsec)<0) {
+        temp.tv_sec = end.tv_sec-start.tv_sec-1;
+	temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec;
+    } else {
+        temp.tv_sec = end.tv_sec-start.tv_sec;
+	temp.tv_nsec = end.tv_nsec-start.tv_nsec;
+    }
+    return temp;
+}
+
+void print_difftimes()
+{
+#ifdef DEBUG
+    printf("difftimes min = %lu ns ; max = %lu ns\n", min_diff_time.tv_nsec, max_diff_time.tv_nsec);
+#else
+    LOG_I(HW,"difftimes min = %lu ns ; max = %lu ns\n", min_diff_time.tv_nsec, max_diff_time.tv_nsec);
+#endif
+}
+
+void update_difftimes(struct timespec start, struct timespec end)
+{
+    struct timespec diff_time = { .tv_sec = 0, .tv_nsec = 0 };
+    int             changed = 0;
+    diff_time = clock_difftime(start, end);
+    if ((min_diff_time.tv_nsec == 0) || (diff_time.tv_nsec < min_diff_time.tv_nsec)) { min_diff_time.tv_nsec = diff_time.tv_nsec; changed = 1; }
+    if ((max_diff_time.tv_nsec == 0) || (diff_time.tv_nsec > max_diff_time.tv_nsec)) { max_diff_time.tv_nsec = diff_time.tv_nsec; changed = 1; }
+#if 1
+    if (changed) print_difftimes();
+#endif
+}
+
+/*------------------------------------------------------------------------*/
+
 unsigned int build_rflocal(int txi, int txq, int rxi, int rxq)
 {
   return (txi + (txq<<6) + (rxi<<12) + (rxq<<18));
@@ -411,6 +456,7 @@ void help (void) {
   printf("  sudo -E lte-softmodem [options]\n");
   printf("  sudo -E ./lte-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.exmimo2.openEPC.conf -S -V -m 26 -t 16 -x 1 --ulsch-max-errors 100 -W\n\n");
   printf("Options:\n");
+  printf("  --rf-config-file Configuration file for front-end (e.g. LMS7002M)\n");
   printf("  --ulsch-max-errors set the max ULSCH erros\n");
   printf("  --calib-ue-rx set UE RX calibration\n");
   printf("  --calib-ue-rx-med \n");
@@ -430,7 +476,6 @@ void help (void) {
   printf("  -h provides this help message!\n");
   printf("  -K Generate ITTI analyzser logs (similar to wireshark logs but with more details)\n");
   printf("  -m Set the maximum downlink MCS\n");
-  printf("  -M IP address of RRH\n");
   printf("  -O eNB configuration file (located in targets/PROJECTS/GENERIC-LTE-EPC/CONF\n");
   printf("  -q Enable processing timing measurement of lte softmodem on per subframe basis \n");
   printf("  -r Set the PRB, valid values: 6, 25, 50, 100  \n");    
@@ -943,32 +988,26 @@ void do_OFDM_mod_rt(int subframe,PHY_VARS_eNB *phy_vars_eNB)
 	len = phy_vars_eNB->lte_frame_parms.samples_per_tti>>1;
       else
 	len = phy_vars_eNB->lte_frame_parms.samples_per_tti;
- 
-     for (i=0; i<len; i++) {
+      /*
+      for (i=0;i<len;i+=4) {
+	dummy_tx_b[i] = 0x100;
+	dummy_tx_b[i+1] = 0x01000000;
+	dummy_tx_b[i+2] = 0xff00;
+	dummy_tx_b[i+3] = 0xff000000;
+	}*/
+      for (i=0; i<len; i++) {
         tx_offset = (int)slot_offset+time_offset[aa]+i;
 
+	
         if (tx_offset<0)
           tx_offset += LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*phy_vars_eNB->lte_frame_parms.samples_per_tti;
 
         if (tx_offset>=(LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*phy_vars_eNB->lte_frame_parms.samples_per_tti))
           tx_offset -= LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*phy_vars_eNB->lte_frame_parms.samples_per_tti;
 
-        ((short*)&phy_vars_eNB->lte_eNB_common_vars.txdata[0][aa][tx_offset])[0]=
-#ifdef EXMIMO
-          ((short*)dummy_tx_b)[2*i]<<4;
-#elif OAI_BLADERF
-	((short*)dummy_tx_b)[2*i];
-#else
-          ((short*)dummy_tx_b)[2*i]<<4;
-#endif
-	  ((short*)&phy_vars_eNB->lte_eNB_common_vars.txdata[0][aa][tx_offset])[1]=
-#ifdef EXMIMO
-	    ((short*)dummy_tx_b)[2*i+1]<<4;
-#elif OAI_BLADERF
-	  ((short*)dummy_tx_b)[2*i+1];
-#else
-	  ((short*)dummy_tx_b)[2*i+1]<<4;
-#endif
+	((short*)&phy_vars_eNB->lte_eNB_common_vars.txdata[0][aa][tx_offset])[0] = ((short*)dummy_tx_b)[2*i]<<openair0_cfg[0].iq_txshift;
+	
+	((short*)&phy_vars_eNB->lte_eNB_common_vars.txdata[0][aa][tx_offset])[1] = ((short*)dummy_tx_b)[2*i+1]<<openair0_cfg[0].iq_txshift;
      }
      // if S-subframe switch to RX in second subframe
      if (subframe_select(&phy_vars_eNB->lte_frame_parms,subframe) == SF_S) {
@@ -1825,7 +1864,9 @@ static void* eNB_thread( void* arg )
 				     PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_rx);
       
       stop_meas( &softmodem_stats_hw );
-      clock_gettime( CLOCK_MONOTONIC, &trx_time1 );
+      if (frame > 50) { 
+	  clock_gettime( CLOCK_MONOTONIC, &trx_time1 );
+      }
 
       if (frame > 20){ 
 	if (rxs != spp)
@@ -1834,8 +1875,6 @@ static void* eNB_thread( void* arg )
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
 
       // Transmit TX buffer based on timestamp from RX
-
-
     
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
       // prepare tx buffer pointers
@@ -1855,17 +1894,28 @@ static void* eNB_thread( void* arg )
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (timestamp+(openair0_cfg[card].tx_scheduling_advance)-openair0_cfg[card].tx_sample_advance)&0xffffffff );
 
       stop_meas( &softmodem_stats_mt );
-      clock_gettime( CLOCK_MONOTONIC, &trx_time2 );
+      if (frame > 50) { 
+	  clock_gettime( CLOCK_MONOTONIC, &trx_time2 );
+	  //update_difftimes(trx_time1, trx_time2);
+      }
+
 
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE,0);
 #else
       // USRP_DEBUG is active
       rt_sleep_ns(1000000);
 #endif
-
-      if ((frame>50) &&
-	  (tx_launched == 0) &&
-          (rx_pos >= (((2*hw_subframe)+1)*PHY_vars_eNB_g[0][0]->lte_frame_parms.samples_per_tti>>1))) {
+      /* FT configurable tx lauch delay (in slots): txlaunch_wait, txlaunch_wait_slotcount is device specific and 
+	 set in the corresponding library (with txlaunch_wait=1 and txlaunch_wait_slotcount=1 the check is as it previously was) */
+      /* old check:
+	 if ((frame>50) &&
+	 (tx_launched == 0) &&
+	 (rx_pos >= (((2*hw_subframe)+1)*PHY_vars_eNB_g[0][0]->lte_frame_parms.samples_per_tti>>1))) {*/
+      if ( (frame>50) && (tx_launched == 0) &&
+	   ((openair0_cfg[card].txlaunch_wait == 0) ||
+	    ((openair0_cfg[card].txlaunch_wait == 1) &&
+	     (rx_pos >= (((2*hw_subframe)+openair0_cfg[card].txlaunch_wait_slotcount)*PHY_vars_eNB_g[0][0]->lte_frame_parms.samples_per_tti>>1))))) { 
+	
         tx_launched = 1;
 
         for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
@@ -2027,6 +2077,9 @@ eNB_thread_cleanup:
 #endif
 
   eNB_thread_status = 0;
+
+  // print_difftimes();
+
   return &eNB_thread_status;
 }
 
@@ -2056,6 +2109,7 @@ static void get_options (int argc, char **argv)
 
   enum long_option_e {
     LONG_OPTION_START = 0x100, /* Start after regular single char options */
+    LONG_OPTION_RF_CONFIG_FILE,
     LONG_OPTION_ULSCH_MAX_CONSECUTIVE_ERRORS,
     LONG_OPTION_CALIB_UE_RX,
     LONG_OPTION_CALIB_UE_RX_MED,
@@ -2072,6 +2126,7 @@ static void get_options (int argc, char **argv)
   };
 
   static const struct option long_options[] = {
+    {"rf-config-file",required_argument,  NULL, LONG_OPTION_RF_CONFIG_FILE},
     {"ulsch-max-errors",required_argument,  NULL, LONG_OPTION_ULSCH_MAX_CONSECUTIVE_ERRORS},
     {"calib-ue-rx",     required_argument,  NULL, LONG_OPTION_CALIB_UE_RX},
     {"calib-ue-rx-med", required_argument,  NULL, LONG_OPTION_CALIB_UE_RX_MED},
@@ -2090,11 +2145,19 @@ static void get_options (int argc, char **argv)
 
   while ((c = getopt_long (argc, argv, "A:a:C:dEK:g:F:G:hqO:m:SUVRM:r:P:Ws:t:Tx:",long_options,NULL)) != -1) {
     switch (c) {
+    case LONG_OPTION_RF_CONFIG_FILE:
+      if (strlen(optarg)<=1024)
+         strcpy(rf_config_file,optarg);
+      else {
+         printf("Configuration filename is too long\n");
+         exit(-1);   
+      }
+      break;
     case LONG_OPTION_MAXPOWER:
       tx_max_power[0]=atoi(optarg);
       for (CC_id=1;CC_id<MAX_NUM_CCs;CC_id++)
 	tx_max_power[CC_id]=tx_max_power[0];
-
+      break;
     case LONG_OPTION_ULSCH_MAX_CONSECUTIVE_ERRORS:
       ULSCH_max_consecutive_errors = atoi(optarg);
       printf("Set ULSCH_max_consecutive_errors = %d\n",ULSCH_max_consecutive_errors);
@@ -2155,14 +2218,7 @@ static void get_options (int argc, char **argv)
 
    case LONG_OPTION_DUMP_FRAME:
      mode = rx_dump_frame;
-     break;
-
-    case 'M':
-#ifdef ETHERNET
-      strcpy(rrh_eNB_ip,optarg);
-#endif
-      break;
-
+     break;   
     case 'A':
       timing_advance = atoi (optarg);
       break;
@@ -2405,6 +2461,41 @@ static void get_options (int argc, char **argv)
                    "lte-softmodem compiled with MAX_NUM_CCs=%d, but only %d CCs configured for eNB %d!",
                    MAX_NUM_CCs, enb_properties->properties[i]->nb_cc, i);
 
+      for (j=0; j<enb_properties->properties[i]->nb_rrh_gw; j++) {
+	
+	if (enb_properties->properties[i]->rrh_gw_config[j].active == 1 ) {
+	  local_remote_radio = BBU_REMOTE_RADIO_HEAD;
+	  eth_params = (eth_params_t*)malloc(sizeof(eth_params_t));
+	  memset(eth_params, 0, sizeof(eth_params_t));
+	  
+	  eth_params->local_if_name             = enb_properties->properties[i]->rrh_gw_if_name;
+	  eth_params->my_addr                   = enb_properties->properties[i]->rrh_gw_config[j].local_address;
+	  eth_params->my_port                   = enb_properties->properties[i]->rrh_gw_config[j].local_port;
+	  eth_params->remote_addr               = enb_properties->properties[i]->rrh_gw_config[j].remote_address;
+	  eth_params->remote_port               = enb_properties->properties[i]->rrh_gw_config[j].remote_port;
+	  eth_params->transp_preference         = enb_properties->properties[i]->rrh_gw_config[j].raw;	 
+	  eth_params->iq_txshift                = enb_properties->properties[i]->rrh_gw_config[j].iq_txshift;
+	  eth_params->tx_sample_advance         = enb_properties->properties[i]->rrh_gw_config[j].tx_sample_advance;
+	  eth_params->tx_scheduling_advance     = enb_properties->properties[i]->rrh_gw_config[j].tx_scheduling_advance;
+	  if (enb_properties->properties[i]->rrh_gw_config[j].exmimo == 1) {
+	     eth_params->rf_preference          = EXMIMO_DEV;
+	  } else if (enb_properties->properties[i]->rrh_gw_config[j].usrp_b200 == 1) {
+	    eth_params->rf_preference          = USRP_B200_DEV;
+	  } else if (enb_properties->properties[i]->rrh_gw_config[j].usrp_x300 == 1) {
+	   eth_params->rf_preference          = USRP_X300_DEV;
+	  } else if (enb_properties->properties[i]->rrh_gw_config[j].bladerf == 1) {
+	    eth_params->rf_preference          = BLADERF_DEV;
+	  } else if (enb_properties->properties[i]->rrh_gw_config[j].lmssdr == 1) {
+	    //eth_params->rf_preference          = LMSSDR_DEV;
+	  } else {
+	    eth_params->rf_preference          = 0;
+	  } 
+	} else {
+	  local_remote_radio = BBU_LOCAL_RADIO_HEAD; 
+	}
+	
+      }
+
       for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
         frame_parms[CC_id]->frame_type =       enb_properties->properties[i]->frame_type[CC_id];
         frame_parms[CC_id]->tdd_config =       enb_properties->properties[i]->tdd_config[CC_id];
@@ -2557,8 +2648,12 @@ int main( int argc, char **argv )
   }
   logInit();
  
+  rf_config_file[0]='\0';
   get_options (argc, argv); //Command-line options
- 
+  if (rf_config_file[0] == '\0')
+    openair0_cfg[0].configFilename = NULL;
+  else
+    openair0_cfg[0].configFilename = rf_config_file;
   
   // initialize the log (see log.h for details)
   set_glog(glog_level, glog_verbosity);
@@ -2943,20 +3038,13 @@ int main( int argc, char **argv )
     else //FDD
       openair0_cfg[card].duplex_mode = duplex_mode_FDD;
 
-#ifdef ETHERNET
-
-    //calib needed
-    openair0_cfg[card].tx_scheduling_advance = 0;
-    openair0_cfg[card].tx_sample_advance = 0;
-    
-    if (frame_parms[0]->N_RB_DL == 6) 
-      openair0_cfg[card].samples_per_packet = 256;
-    else 
-      openair0_cfg[card].samples_per_packet = 1024;
-
-    printf("HW: samples_per_packet %d\n",openair0_cfg[card].samples_per_packet);
-#endif
 
+    if (local_remote_radio == BBU_REMOTE_RADIO_HEAD) {      
+      openair0_cfg[card].remote_addr    = eth_params->remote_addr;
+      openair0_cfg[card].remote_port    = eth_params->remote_port;
+      openair0_cfg[card].my_addr        = eth_params->my_addr;
+      openair0_cfg[card].my_port        = eth_params->my_port;    
+    }
 
     printf("HW: Configuring card %d, nb_antennas_tx/rx %d/%d\n",card,
            ((UE_flag==0) ? PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_tx : PHY_vars_UE_g[0][0]->lte_frame_parms.nb_antennas_tx),
@@ -2966,13 +3054,10 @@ int main( int argc, char **argv )
 
     if (UE_flag) {
       printf("ETHERNET: Configuring UE ETH for %s:%d\n",rrh_UE_ip,rrh_UE_port);
-      openair0_cfg[card].remote_ip   = &rrh_UE_ip[0];
+      openair0_cfg[card].remote_addr   = &rrh_UE_ip[0];
       openair0_cfg[card].remote_port = rrh_UE_port;
-    } else {
-      printf("ETHERNET: Configuring eNB ETH for %s:%d\n",rrh_eNB_ip,rrh_eNB_port);
-      openair0_cfg[card].remote_ip   = &rrh_eNB_ip[0];
-      openair0_cfg[card].remote_port = rrh_eNB_port;
-    }
+    } 
+
     openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL;
 #endif
 
@@ -3029,22 +3114,40 @@ int main( int argc, char **argv )
 
 #endif
   }
-
-  openair0.func_type = BBU_FUNC;
+  /* device host type is set*/
+  openair0.host_type = BBU_HOST;
+  /* device type is initialized NONE_DEV (no RF device) when the RF device will be initiated device type will be set */
+  openair0.type = NONE_DEV;
+  /* transport type is initialized NONE_TP (no transport protocol) when the transport protocol will be initiated transport protocol type will be set */
+  openair0.transp_type = NONE_TP;
   openair0_cfg[0].log_level = glog_level;
 
-  if (mode!=loop_through_memory){
-    int ret;
-    ret= openair0_device_init(&openair0, &openair0_cfg[0]);
-    printf("openair0_device_init returns %d\n",ret);
-    if (ret<0) {
-      printf("Exiting, cannot initialize device\n");
-      exit(-1);
+  int returns=-1;
+  /* BBU can have either a local or a remote radio head */  
+  if (local_remote_radio == BBU_LOCAL_RADIO_HEAD) { //local radio head active  - load library of radio head and initiate it
+    if (mode!=loop_through_memory) {
+      returns=openair0_device_load(&openair0, &openair0_cfg[0]);
+      printf("openair0_device_init returns %d\n",returns);
+      if (returns<0) {
+	printf("Exiting, cannot initialize device\n");
+	exit(-1);
+      }
     }
-  }
-  else if (mode==loop_through_memory) {    
-  }
- 
+    else if (mode==loop_through_memory) {    
+    }
+  }  else { //remote radio head active - load library of transport protocol and initiate it 
+    if (mode!=loop_through_memory) {
+      returns=openair0_transport_load(&openair0, &openair0_cfg[0], eth_params);
+      printf("openair0_transport_init returns %d\n",returns);
+      if (returns<0) { 
+	printf("Exiting, cannot initialize transport protocol\n");
+	exit(-1);
+      }
+    }
+    else if (mode==loop_through_memory) {    
+    }
+  }   
+  
   printf("Done\n");
 
   mac_xface = malloc(sizeof(MAC_xface));
@@ -3467,7 +3570,6 @@ int main( int argc, char **argv )
     if (multi_thread>0) {
       printf("Killing eNB processing threads\n");
       kill_eNB_proc();
-
     }
   }
 
@@ -3559,10 +3661,6 @@ int setup_eNB_buffers(PHY_VARS_eNB **phy_vars_eNB, openair0_config_t *openair0_c
 
 #endif
 
-
-
-
-
     // replace RX signal buffers with mmaped HW versions
 #ifdef EXMIMO
     openair0_cfg[CC_id].tx_num_channels = 0;
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 6293ad4264c609d2821c67dfb626ef6b7e647c05..c31ad32009636b99f281bf28c71aa1b993bef82c 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -529,11 +529,11 @@ static void *UE_thread_synch(void *arg)
 	    
 #endif
 
-#ifdef OAI_USRP
+#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
             openair0_cfg[card].rx_gain[i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
 	    
 	    
-
+#if 0
             switch(UE->lte_frame_parms.N_RB_DL) {
             case 6:
               openair0_cfg[card].rx_gain[i] -= 12;
@@ -555,7 +555,7 @@ static void *UE_thread_synch(void *arg)
               printf("Unknown number of RBs %d\n",UE->lte_frame_parms.N_RB_DL);
               break;
             }
-	    
+#endif	    
 #endif
           }
         }
diff --git a/targets/RT/USER/rrh.gtkw b/targets/RT/USER/rrh.gtkw
index 22a5a9f575b252528a9bb701ba3940c826296adc..891f23ada52417ffd360f617eab2eeecd2ef16cd 100644
--- a/targets/RT/USER/rrh.gtkw
+++ b/targets/RT/USER/rrh.gtkw
@@ -1,19 +1,19 @@
 [*]
 [*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
-[*] Thu Sep 17 14:23:43 2015
+[*] Fri Jan 29 16:34:46 2016
 [*]
 [dumpfile] "/tmp/openair_dump_rrh.vcd"
-[dumpfile_mtime] "Thu Sep 17 14:21:43 2015"
-[dumpfile_size] 636509125
-[savefile] "/home/guepe/openair4G/targets/RT/USER/rrh.gtkw"
-[timestart] 17746655400
-[size] 1855 1056
-[pos] -1 -1
-*-15.826077 17746846200 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[dumpfile_mtime] "Fri Jan 29 16:20:55 2016"
+[dumpfile_size] 224259458
+[savefile] "/home/guepe/openairinterface5g_rrh/openairinterface5g/targets/RT/USER/rrh.gtkw"
+[timestart] 31315875900
+[size] 1004 1028
+[pos] 926 -1
+*-17.429794 31316090054 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
 [sst_width] 224
-[signals_width] 230
+[signals_width] 261
 [sst_expanded] 1
-[sst_vpaned_height] 287
+[sst_vpaned_height] 278
 @24
 [color] 1
 variables.hw_frame_rx[63:0]
@@ -23,7 +23,10 @@ variables.hw_subframe_rx[63:0]
 [color] 1
 functions.eNB_rx
 functions.eNB_rx_sleep
-functions.trx_write_rf
+[color] 3
+functions.trx_read_rf
+[color] 7
+functions.trx_write
 @c00024
 variables.rxcnt[63:0]
 @28
@@ -95,24 +98,97 @@ variables.rxcnt[63:0]
 -group_end
 @24
 variables.pck_rx[63:0]
+variables.rx_ts[63:0]
+@c00024
+variables.tx_seq_num[63:0]
+@28
+(0)variables.tx_seq_num[63:0]
+(1)variables.tx_seq_num[63:0]
+(2)variables.tx_seq_num[63:0]
+(3)variables.tx_seq_num[63:0]
+(4)variables.tx_seq_num[63:0]
+(5)variables.tx_seq_num[63:0]
+(6)variables.tx_seq_num[63:0]
+(7)variables.tx_seq_num[63:0]
+(8)variables.tx_seq_num[63:0]
+(9)variables.tx_seq_num[63:0]
+(10)variables.tx_seq_num[63:0]
+(11)variables.tx_seq_num[63:0]
+(12)variables.tx_seq_num[63:0]
+(13)variables.tx_seq_num[63:0]
+(14)variables.tx_seq_num[63:0]
+(15)variables.tx_seq_num[63:0]
+(16)variables.tx_seq_num[63:0]
+(17)variables.tx_seq_num[63:0]
+(18)variables.tx_seq_num[63:0]
+(19)variables.tx_seq_num[63:0]
+(20)variables.tx_seq_num[63:0]
+(21)variables.tx_seq_num[63:0]
+(22)variables.tx_seq_num[63:0]
+(23)variables.tx_seq_num[63:0]
+(24)variables.tx_seq_num[63:0]
+(25)variables.tx_seq_num[63:0]
+(26)variables.tx_seq_num[63:0]
+(27)variables.tx_seq_num[63:0]
+(28)variables.tx_seq_num[63:0]
+(29)variables.tx_seq_num[63:0]
+(30)variables.tx_seq_num[63:0]
+(31)variables.tx_seq_num[63:0]
+(32)variables.tx_seq_num[63:0]
+(33)variables.tx_seq_num[63:0]
+(34)variables.tx_seq_num[63:0]
+(35)variables.tx_seq_num[63:0]
+(36)variables.tx_seq_num[63:0]
+(37)variables.tx_seq_num[63:0]
+(38)variables.tx_seq_num[63:0]
+(39)variables.tx_seq_num[63:0]
+(40)variables.tx_seq_num[63:0]
+(41)variables.tx_seq_num[63:0]
+(42)variables.tx_seq_num[63:0]
+(43)variables.tx_seq_num[63:0]
+(44)variables.tx_seq_num[63:0]
+(45)variables.tx_seq_num[63:0]
+(46)variables.tx_seq_num[63:0]
+(47)variables.tx_seq_num[63:0]
+(48)variables.tx_seq_num[63:0]
+(49)variables.tx_seq_num[63:0]
+(50)variables.tx_seq_num[63:0]
+(51)variables.tx_seq_num[63:0]
+(52)variables.tx_seq_num[63:0]
+(53)variables.tx_seq_num[63:0]
+(54)variables.tx_seq_num[63:0]
+(55)variables.tx_seq_num[63:0]
+(56)variables.tx_seq_num[63:0]
+(57)variables.tx_seq_num[63:0]
+(58)variables.tx_seq_num[63:0]
+(59)variables.tx_seq_num[63:0]
+(60)variables.tx_seq_num[63:0]
+(61)variables.tx_seq_num[63:0]
+(62)variables.tx_seq_num[63:0]
+(63)variables.tx_seq_num[63:0]
+@1401200
+-group_end
+@24
 variables.hw_frame[63:0]
 variables.hw_subframe[63:0]
 @28
 [color] 1
 functions.eNB_tx
 functions.eNB_tx_sleep
-functions.trx_read_rf
-[color] 7
-functions.trx_write
 [color] 7
 functions.trx_read
+[color] 3
+functions.trx_write_rf
 @24
 variables.txcnt[63:0]
-variables.rx_ts[63:0]
+variables.pck_tx[63:0]
 variables.tx_ts[63:0]
+@25
+variables.rx_seq_num_prv[63:0]
+@24
+variables.rx_seq_num[63:0]
 variables.hw_cnt_rx[63:0]
 variables.lhw_cnt_rx[63:0]
-@25
 [color] 3
 variables.cnt[63:0]
 [pattern_trace] 1
diff --git a/targets/RT/USER/rrh_gw.c b/targets/RT/USER/rrh_gw.c
index 89c8679554ef7053b2853dc8b10d4ea01145ded9..8084644b853e0b538968bedba3d40f625824344b 100644
--- a/targets/RT/USER/rrh_gw.c
+++ b/targets/RT/USER/rrh_gw.c
@@ -51,9 +51,9 @@
 #include <time.h>
 
 #include "common_lib.h"
-#include "rrh_gw.h" // change to rrh_new.h, put externs in rrh_extern.h
+#include "rrh_gw.h"
 #include "rt_wrapper.h"
-#include "rrh_gw_externs.h" // change to rrh_new.h, put externs in rrh_extern.h
+#include "rrh_gw_externs.h"
 
 
 #include "log_if.h"
@@ -71,8 +71,9 @@
  *****************************************************************************************/
 
 
-
-char rrh_ip[20] = "192.168.12.242"; // there is code to detect the my ip address
+/* local IP/MAC address is detected*/
+char rrh_ip[20] = "0.0.0.0"; 
+unsigned char rrh_mac[6] = "0:0:0:0:0:0"; 
 int  rrh_port = 50000; // has to be an option
 
 /* log */
@@ -86,7 +87,7 @@ int16_t           ue_log_level        = LOG_INFO;
 int16_t           ue_log_verbosity    = LOG_MED;
 
 
-/* flags definitions */
+/* flag definitions */
 uint8_t 	eNB_flag=0;
 uint8_t 	UE_flag=0;
 uint8_t 	EXMIMO_flag=0;
@@ -102,18 +103,15 @@ uint8_t         measurements_flag=0;
    - default ethernet interface is local */
 uint8_t 	    num_eNB_mod=0;
 uint8_t 	    num_UE_mod=0;
-uint8_t 	    num_EXMIMO_mod=0;
-uint8_t 	    num_USRP_mod=0;
-uint8_t             hardware_target=NONE_IF;
-char*               if_name="lo";
+char*           if_name="lo";
+uint8_t         eth_mode=ETH_UDP_MODE;
 
 rrh_module_t 	        *enb_array;
 rrh_module_t            *ue_array;
 
 openair0_vtimestamp 	hw_counter=0;
 
-
-
+char   rf_config_file[1024];
 
 static void debug_init(void);
 static void get_options(int argc, char *argv[]);
@@ -128,14 +126,14 @@ static void print_help(void);
 */
 static rrh_module_t new_module(unsigned int id);
 
-/*!\fn static int get_ip_address(char* if_name)
+/*!\fn static int get_address(char* if_name, uint8_t flag);
  * \brief retrieves IP address from the specified network interface
  * \param[in] name of network interface
  * \return 0 
  * \note
  * @ingroup  _oai
  */
-static int get_ip_address(char* if_name);
+static int get_address(char* if_name, uint8_t flag);
 
 
 
@@ -144,7 +142,7 @@ static int get_ip_address(char* if_name);
 int main(int argc, char **argv) {
   
   unsigned int i;
-  
+  rf_config_file[0]='\0';
   /* parse input arguments */
   get_options(argc, argv);
   /* initialize logger and signal analyzer */
@@ -192,48 +190,53 @@ static rrh_module_t new_module (unsigned int id) {
   rrh_mod.measurements=measurements_flag;
 
   /* each module is associated with an ethernet device */
-  rrh_mod.eth_dev.type=ETH_IF;
+  rrh_mod.eth_dev.type=NONE_DEV;
+  rrh_mod.eth_dev.transp_type=NONE_TP;
   /* ethernet device is functioning within RRH */
-  rrh_mod.eth_dev.func_type=RRH_FUNC; 
-  /* specify IP address */
-  get_ip_address(if_name);
-  openair0_cfg.my_ip=&rrh_ip[0];
-  openair0_cfg.my_port=rrh_port;
+  rrh_mod.eth_dev.host_type=RRH_HOST;
+  /* */
+  rrh_mod.eth_dev.openair0_cfg = (openair0_config_t*)malloc(sizeof(openair0_config_t));
+  memset(rrh_mod.eth_dev.openair0_cfg,0,sizeof(openair0_config_t));
+  /* get IP and MAC address */
+  get_address(if_name,eth_mode);
+  
+  if(eth_mode==ETH_UDP_MODE) {
+    openair0_cfg.my_addr = &rrh_ip[0];
+    openair0_cfg.my_port = rrh_port;
+    LOG_I(RRH,"UDP mode selected for ethernet.\n");
+  } else if (eth_mode==ETH_RAW_MODE) {
+    openair0_cfg.my_addr = &rrh_mac[0];
+    openair0_cfg.my_port = rrh_port;
+    LOG_I(RRH,"RAW mode selected for ethernet.\n");
+  } 
+
+  /* */
+  eth_params_t *eth_params = (eth_params_t*)malloc(sizeof(eth_params_t));
+  memset(eth_params, 0, sizeof(eth_params_t));
+  eth_params->local_if_name     = if_name;
+  eth_params->transp_preference = eth_mode;
 
   /* ethernet device initialization */
-  if (openair0_dev_init_eth(&rrh_mod.eth_dev, &openair0_cfg)<0){
+  if (openair0_transport_load(&rrh_mod.eth_dev, &openair0_cfg,eth_params)<0) {
     LOG_E(RRH,"Exiting, cannot initialize ethernet interface.\n");
     exit(-1);
   }
 
   /* allocate space and specify associated RF device */
   openair0_device *oai_dv = (openair0_device *)malloc(sizeof(openair0_device));
-  memset(oai_dv,0, sizeof(openair0_device));
+  memset(oai_dv,0,sizeof(openair0_device));
 
-#ifdef EXMIMO
   rrh_mod.devs=oai_dv;   
-  rrh_mod.devs->type=EXMIMO_IF;
-  LOG_I(RRH,"Setting RF device to EXMIMO\n");	   
-#elif OAI_USRP
-  rrh_mod.devs=oai_dv;	
-  rrh_mod.devs->type=USRP_B200_IF;
-  LOG_I(RRH,"Setting RF device to USRP\n");    	 
-#elif OAI_BLADERF
-  rrh_mod.devs=oai_dv;	
-  rrh_mod.devs->type=BLADERF_IF;
-  LOG_I(RRH,"Setting RF device to BLADERF\n");
-#else
-  rrh_mod.devs=oai_dv;
-  rrh_mod.devs->type=NONE_IF;
-  LOG_I(RRH,"Setting RF interface to NONE_IF... \n");
-#endif  
-  
+  rrh_mod.devs->type=NONE_DEV;
+  rrh_mod.devs->transp_type=NONE_TP;
+  rrh_mod.devs->host_type=RRH_HOST; 
+
   return rrh_mod;
 }
 
 static void debug_init(void) {
   
-  // log initialization
+  /* log initialization */
   logInit();
   set_glog(glog_level,  glog_verbosity);
   
@@ -241,7 +244,7 @@ static void debug_init(void) {
   //set_comp_log(ENB_LOG, enb_log_level,   enb_log_verbosity, 1);
   //set_comp_log(UE_LOG,  ue_log_level,    ue_log_verbosity,  1);
   
-  // vcd initialization
+  /* vcd initialization */
   if (ouput_vcd) {
     vcd_signal_dumper_init("/tmp/openair_dump_rrh.vcd");
     
@@ -253,7 +256,7 @@ static void get_options(int argc, char *argv[]) {
 
   int 	opt;
 
-  while ((opt = getopt(argc, argv, "xvhlte:n:u:g:r:w:i:")) != -1) {
+  while ((opt = getopt(argc, argv, "xvhlte:n:u:g:r:m:i:f:")) != -1) {
     
     switch (opt) {
     case 'n':
@@ -273,6 +276,9 @@ static void get_options(int argc, char *argv[]) {
 	printf("RRH interface name is set to %s\n", if_name);	
       }
       break;
+    case 'm':  
+      eth_mode=atoi(optarg);      
+      break;
     case 'r':
       //rrh_log_level=atoi(optarg);
       break;
@@ -292,17 +298,27 @@ static void get_options(int argc, char *argv[]) {
       /*In loopback mode rrh sends back to bbu what it receives*/
       loopback_flag=1; 
       break;
+    case 'f':
+      if (optarg){
+	if ((strcmp("null", optarg) == 0) || (strcmp("NULL", optarg) == 0)) {
+	  printf("no configuration filename is provided\n");
+	}
+	else if (strlen(optarg)<=1024){
+	  // rf_config_file = strdup(optarg);
+	  strcpy(rf_config_file,optarg);
+	}else {
+	  printf("Configuration filename is too long\n");
+	  exit(-1);   
+	}
+      }
+      break;
     case 't':
-      /*When measurements are enabled statistics related to TX/RX time are printed*/
+      /* When measurements are enabled statistics related to TX/RX time are printed */
       measurements_flag=1; 
-      break;
-    case 'w':
-      /* force to use this target*/    
-      hardware_target=1;
-      break;
-  case 'h':
-    print_help();
-    exit(-1);
+      break;      
+    case 'h':
+      print_help();
+      exit(-1);
     default: /* '?' */
       //fprintf(stderr, "Usage: \n", argv[0]);
       exit(-1);
@@ -311,31 +327,34 @@ static void get_options(int argc, char *argv[]) {
 
 }
 
-static int get_ip_address(char* if_name) {
+static int get_address(char* if_name, uint8_t flag) {
   
   int fd;
   struct ifreq ifr;
-  
-  
-  fd = socket(AF_INET, SOCK_DGRAM, 0);
-  
+    
+  fd = socket(AF_INET, SOCK_DGRAM, 0);  
   /* I want to get an IPv4 IP address */
-  ifr.ifr_addr.sa_family = AF_INET;
-  
+  ifr.ifr_addr.sa_family = AF_INET;  
   /* I want IP address attached to "if_name" */
   strncpy(ifr.ifr_name, if_name, IFNAMSIZ-1);
-  
-  if ( ioctl(fd, SIOCGIFADDR, &ifr)<0 ) {
-    perror("IOCTL:");
-    exit(-1);
-  } 
+
+  if (flag==ETH_UDP_MODE) {
+    if ( ioctl(fd, SIOCGIFADDR, &ifr)<0 ) {
+      perror("IOCTL:");
+      exit(-1);
+    } 
+    snprintf(&rrh_ip[0],20,"%s", inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr));
+    LOG_I(RRH,"%s: IP address: %s\n",if_name,rrh_ip);
+  } else if (flag==ETH_RAW_MODE) {
+    if ( ioctl(fd, SIOCGIFHWADDR, &ifr)<0 ) {
+      perror("IOCTL:");
+      exit(-1);
+    } 
+    ether_ntoa_r ((unsigned char *)ifr.ifr_hwaddr.sa_data, rrh_mac);
+    LOG_I(RRH,"%s: MAC address: %s\n",if_name,rrh_mac);    
+  }
   
   close(fd);
-  
-  /* display result */
-  snprintf(&rrh_ip[0],20,"%s", inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr));
-  LOG_I(RRH,"Got IP address %s from interface %s\n", rrh_ip,if_name);
-
   return 0;
 }
 
@@ -343,19 +362,19 @@ static int get_ip_address(char* if_name) {
 static void print_help(void) {
 
   puts("Usage: \n");
-  puts("     sudo -E chrt 99 ./rrh -n1 -g6 -v -t");
+  puts("     sudo -E chrt 99 ./rrh -n1 -g6 -v -t -i lo -m1");
   puts("Options:\n");
   puts("\t -n create eNB module\n");
   puts("\t -u create UE module\n");
   puts("\t -g define global log level\n");
   puts("\t -i set the RRH interface (default lo)\n");
+  puts("\t -m set ethernet mode to be used by RRH, valid options: (1:raw, 0:udp) \n");
   puts("\t -r define rrh log level\n");
   puts("\t -e define eNB log level\n");
   puts("\t -x enable real time bahaviour\n");
   puts("\t -v enable vcd dump\n");
   puts("\t -l enable loopback mode\n");
   puts("\t -t enable measurements\n");
-  puts("\t -w force to use specified HW\n");
   puts("\t -h display info\n");
 
 }
diff --git a/targets/RT/USER/rrh_gw_externs.h b/targets/RT/USER/rrh_gw_externs.h
index 8d2d1d7e5e8484a8bc697efc297d7404e24355a0..df59b9b1af323e4786a1280bc129dd582241318f 100644
--- a/targets/RT/USER/rrh_gw_externs.h
+++ b/targets/RT/USER/rrh_gw_externs.h
@@ -39,6 +39,7 @@
 
 #ifndef RRH_GW_EXTERNS_H_
 #define RRH_GW_EXTERNS_H_
+extern char   rf_config_file[1024];
 
 extern openair0_timestamp 	timestamp_UE_tx[4] ,timestamp_UE_rx[4] ,timestamp_eNB_rx[4],timestamp_eNB_tx[4];
 extern openair0_vtimestamp 	hw_counter;