diff --git a/LimeSuite_Build_Thunk.h b/LimeSuite_Build_Thunk.h
index b840e72..0557e1e 100644
--- a/LimeSuite_Build_Thunk.h
+++ b/LimeSuite_Build_Thunk.h
@@ -5,19 +5,17 @@
  *
  * Copyright (C) 2016 Lime Microsystems
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This library 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
- * Lesser General Public License for more details.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #ifndef LMS7_API_H
@@ -47,15 +45,22 @@ extern "C" {
 #   else
 #       define API_EXPORT __declspec(dllexport)
 #   endif
-#else
+#elif defined _DOXYGEN_ONLY_
+    /** Marks an API routine to be made visible to the dynamic loader.
+     *  This is OS and/or compiler-specific. */
 #   define API_EXPORT
+    /** Specifies calling convention, if necessary.
+     *  This is OS and/or compiler-specific. */
+#   define CALL_CONV
+#else
+#   define API_EXPORT __attribute__ ((visibility ("default")))
 #   define CALL_CONV
 #endif
 
-/**Floating point data type*/
+///Floating point data type
 typedef double float_type;
 
-/**convenience constant for good return code*/
+///convenience constant for good return code
 static const int LMS_SUCCESS = 0;
 
 /**
@@ -66,10 +71,10 @@ static const int LMS_SUCCESS = 0;
  * @{
  */
 
-/**LMS Device handle */
+///LMS Device handle
 typedef void lms_device_t;
 
-/**Convenience type for fixed length LMS Device information string*/
+///Convenience type for fixed length LMS Device information string
 typedef char lms_info_str_t[256];
 
 /**
@@ -82,8 +87,7 @@ typedef char lms_info_str_t[256];
 API_EXPORT int CALL_CONV LMS_GetDeviceList(lms_info_str_t *dev_list);
 
 /**
- * Opens device specified by the provided ::lms_dev_info string
- *
+ * Opens device specified by the provided ::lms_info_str_t string
  * This function should be used to open a device based upon the results of
  * LMS_GetDeviceList()
  *
@@ -96,8 +100,8 @@ API_EXPORT int CALL_CONV LMS_GetDeviceList(lms_info_str_t *dev_list);
  *
  * @return      0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_Open(lms_device_t **device, lms_info_str_t info,
-                                   void* args);
+API_EXPORT int CALL_CONV LMS_Open(lms_device_t **device, const lms_info_str_t info,
+                                                         void* args);
 
 /**
  * Close device
@@ -110,7 +114,6 @@ API_EXPORT int CALL_CONV LMS_Open(lms_device_t **device, lms_info_str_t info,
  */
 API_EXPORT int CALL_CONV LMS_Close(lms_device_t *device);
 
-
 /**
  * Disconnect device but keep configuration cache (device is not deallocated).
  *
@@ -121,20 +124,17 @@ API_EXPORT int CALL_CONV LMS_Close(lms_device_t *device);
 API_EXPORT int CALL_CONV LMS_Disconnect(lms_device_t *device);
 
 /**
- * Checks if device port is opened
+ * Check if device port is opened
  *
  * @param   device  Device handle previously obtained by LMS_Open().
- * @param   port    0 - control port, 1- data port
+ * @param   port    port index (ignored if device has only 1 port)
  *
  * @return   true(1) if port is open, false (0) if - closed
  */
 API_EXPORT bool CALL_CONV LMS_IsOpen(lms_device_t *device, int port);
 
-
 /** @} (End FN_INIT) */
 
-
-
 /**
  * @defgroup FN_HIGH_LVL    High-level control functions
  *
@@ -144,33 +144,29 @@ API_EXPORT bool CALL_CONV LMS_IsOpen(lms_device_t *device, int port);
  * @{
  */
 
-/**Convenience constants for TX/RX selection*/
-const bool LMS_CH_TX = true;
-const bool LMS_CH_RX = false;
+static const bool LMS_CH_TX = true;   ///<Convenience constants for TX selection
+static const bool LMS_CH_RX = false;  ///<Convenience constants for RX selection
+
+/** Convenience type for fixed length name string*/
+typedef char lms_name_t[16];
 
 /**Structure used to represent the allowed value range of various parameters*/
 typedef struct
 {
-    float_type min;     /**<Minimum allowed value*/
-    float_type max;     /**<Minimum allowed value*/
-    float_type step;    /**<Minimum value step*/
+    float_type min;     ///<Minimum allowed value
+    float_type max;     ///<Minimum allowed value
+    float_type step;    ///<Minimum value step
 }lms_range_t;
 
-/**Enumeration of loopback modes*/
-typedef enum {
-    LMS_LOOPBACK_NONE   /**<Return to normal operation (disable loopback)*/
-} lms_loopback_t;
-
-
 /**Enumeration of LMS7 TEST signal types*/
 typedef enum
 {
-    LMS_TESTSIG_NONE=0,     /**<Disable test signals. Return to normal operation*/
-    LMS_TESTSIG_NCODIV8,    /**<Test signal from NCO half scale*/
-    LMS_TESTSIG_NCODIV4,    /**<Test signal from NCO half scale*/
-    LMS_TESTSIG_NCODIV8F,   /**<Test signal from NCO full scale*/
-    LMS_TESTSIG_NCODIV4F,   /**<Test signal from NCO full scale*/
-    LMS_TESTSIG_DC          /**<DC test signal*/
+    LMS_TESTSIG_NONE=0,     ///<Disable test signals. Return to normal operation
+    LMS_TESTSIG_NCODIV8,    ///<Test signal from NCO half scale
+    LMS_TESTSIG_NCODIV4,    ///<Test signal from NCO half scale
+    LMS_TESTSIG_NCODIV8F,   ///<Test signal from NCO full scale
+    LMS_TESTSIG_NCODIV4F,   ///<Test signal from NCO full scale
+    LMS_TESTSIG_DC          ///<DC test signal
 }lms_testsig_t;
 
 /**
@@ -228,26 +224,26 @@ API_EXPORT int CALL_CONV LMS_SetSampleRate(lms_device_t *device, float_type rate
                                            size_t oversample);
 
 /**
- * Get the sampling rate of the specified LMS device RX or TX channel.
+ * Get the sampling rate of the specified RX or TX channel.
  * The function obtains the sample rate used in data interface with the host and
  * the RF sample rate used by DAC/ADC.
  *
  * @param[in]   device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
+ * @param       chan        Channel index
  * @param[out]  host_Hz     sampling rate used for data exchange with the host
  * @param[out]  rf_Hz       RF sampling rate in Hz
  *
  * @return       0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_GetSampleRate(lms_device_t *device, bool dir_tx,
-                                           size_t chan, float_type *host_Hz,
-                                           float_type *rf_Hz);
+                           size_t chan, float_type *host_Hz, float_type *rf_Hz);
 /**
  * Get the range of supported sampling rates.
  *
- * @param device        Device handle previously obtained by LMS_Open().
- * @param dir_tx        Select RX or TX
- * @param range[out]    Allowed sample rate range in Hz.
+ * @param      device   Device handle previously obtained by LMS_Open().
+ * @param      dir_tx   Select RX or TX
+ * @param[out] range    Allowed sample rate range in Hz.
  *
  * @return              0 on success, (-1) on failure
  */
@@ -255,9 +251,7 @@ API_EXPORT int CALL_CONV LMS_GetSampleRateRange(lms_device_t *device, bool dir_t
                                                 lms_range_t *range);
 
 /**
- * Set RF center frequency in Hz. This automatically selects the appropriate
- * antenna (band path) for the desired frequency. In oder to override antenna
- * selection use LMS_SetAntenna().
+ * Set RF center frequency in Hz.
  *
  * @note setting different frequencies for A and B channels is not supported by
  * LMS7 chip. Changing frequency for one (A or B) channel will result in
@@ -291,20 +285,74 @@ API_EXPORT int CALL_CONV LMS_GetLOFrequency(lms_device_t *device, bool dir_tx,
  *
  * @param       device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
- * @param       chan        Channel index
  * @param[out]  range       Supported RF center frequency in Hz
  *
  * @return      0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_GetLOFrequencyRange(lms_device_t *device,bool dir_tx,
+API_EXPORT int CALL_CONV LMS_GetLOFrequencyRange(lms_device_t *device, bool dir_tx,
                                                  lms_range_t *range);
 
 /**
- * Set the combined gain value
+ * Obtain antenna list with names. First item in the list is the name of antenna
+ * index 0.
+ *
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param       dir_tx  Select RX or TX
+ * @param       chan    channel index
+ * @param[out]  list    List of antenna names (can be NULL)
+ *
+ * @return      number of available antennae, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetAntennaList(lms_device_t *dev, bool dir_tx,
+                                            size_t chan, lms_name_t *list);
+
+/**
+ * Select the antenna for the specified RX or TX channel.
+ *
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param       dir_tx  Select RX or TX
+ * @param       chan    channel index
+ * @param       index   Index of antenna to select
+ *
+ * @return      0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_SetAntenna(lms_device_t *dev, bool dir_tx,
+                                        size_t chan, size_t index);
+
+/**
+ * Obtain currently selected antenna of the the specified RX or TX channel.
+ *
+ * @param dev       Device handle previously obtained by LMS_Open().
+ * @param dir_tx    Select RX or TX
+ * @param chan      channel index
+ *
+ * @return      Index of selected antenna on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetAntenna(lms_device_t *dev, bool dir_tx,
+                                        size_t chan);
+
+/**
+ * Obtains bandwidth (lower and upper frequency) of the specified antenna
  *
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param       dir_tx  Select RX or TX
+ * @param       chan    channel index
+ * @param       index   Antenna index
+ * @param[out]  range   Antenna bandwidth
+ *
+ * @return      0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetAntennaBW(lms_device_t *dev, bool dir_tx,
+                                 size_t chan, size_t index, lms_range_t *range);
+
+/**
+ * Set the combined gain value
  * This function computes and sets the optimal gain values of various amplifiers
  * that are present in the device based on desired normalized gain value.
  *
+ * @note actual gain depends on LO frequency and analog LPF configuration and
+ * resulting output signal level may be different when those values are changed
+ *
  * @param   device      Device handle previously obtained by LMS_Open().
  * @param   dir_tx      Select RX or TX
  * @param   chan        Channel index
@@ -313,11 +361,31 @@ API_EXPORT int CALL_CONV LMS_GetLOFrequencyRange(lms_device_t *device,bool dir_t
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_SetNormalizedGain(lms_device_t *device, bool dir_tx,
-                                                size_t chan,float_type gain);
+                                               size_t chan,float_type gain);
+
+/**
+ * Set the combined gain value in dB
+ * This function computes and sets the optimal gain values of various amplifiers
+ * that are present in the device based on desired  gain value in dB.
+ *
+ * @note actual gain depends on LO frequency and analog LPF configuration and
+ * resulting output signal levle may be different when those values are changed
+ *
+ * @param   device      Device handle previously obtained by LMS_Open().
+ * @param   dir_tx      Select RX or TX
+ * @param   chan        Channel index
+ * @param   gain        Desired gain, range [0, 70] for RX, [0, 60] for TX
+ * @return  0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_SetGaindB(lms_device_t *device, bool dir_tx,
+                                        size_t chan, unsigned gain);
 
 /**
  * Obtain the current combined gain value
  *
+ * @note actual gain depends on LO frequency and analog LPF configuration and
+ * resulting output signal level may be different when those values are changed
+ *
  * @param       device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
  * @param       chan        Channel index
@@ -326,7 +394,22 @@ API_EXPORT int CALL_CONV LMS_SetNormalizedGain(lms_device_t *device, bool dir_tx
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_GetNormalizedGain(lms_device_t *device, bool dir_tx,
-                                                size_t chan,float_type *gain);
+                                                size_t chan, float_type *gain);
+/**
+ * Obtain the current combined gain value in dB
+ *
+ * @note actual gain depends on LO frequency and analog LPF configuration and
+ * resulting output signal level may be different when those values are changed
+ *
+ * @param       device      Device handle previously obtained by LMS_Open().
+ * @param       dir_tx      Select RX or TX
+ * @param       chan        Channel index
+ * @param[out]  gain        Current gain, range [0, 70], [0, 60] for TX
+ * @return  0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetGaindB(lms_device_t *device, bool dir_tx,
+                                                size_t chan, unsigned *gain);
+
 /**
  * Configure analog LPF of the LMS chip for the desired RF bandwidth.
  * This function automatically enables LPF.
@@ -343,6 +426,8 @@ API_EXPORT int CALL_CONV LMS_SetLPFBW(lms_device_t *device, bool dir_tx,
 
 /**
  * Get the currently configured analog LPF RF bandwidth.
+ * @note readback from board is currently not supported, only returns last set
+ * value cached by software.
  *
  * @param       device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
@@ -355,17 +440,16 @@ API_EXPORT int CALL_CONV LMS_GetLPFBW(lms_device_t *device, bool dir_tx,
                                             size_t chan, float_type *bandwidth);
 
 /**
- * Get the RF bandwidth setting range supported by the analog LPF of LMS chip
+ * Get the RF bandwidth setting range supported by the analog LPF of LMS chip.
  *
  * @param       device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
- * @param       chan        Channel index
  * @param[out]  range       Supported RF bandwidth range in Hz
  *
  * @return  0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_GetLPFBWRange(lms_device_t *device,
-                                  bool dir_tx, lms_range_t *range);
+API_EXPORT int CALL_CONV LMS_GetLPFBWRange(lms_device_t *device, bool dir_tx,
+                                            lms_range_t *range);
 
 /**
  * Disables or enables the analog LPF of LMS chip without reconfiguring it.
@@ -378,7 +462,7 @@ API_EXPORT int CALL_CONV LMS_GetLPFBWRange(lms_device_t *device,
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_SetLPF(lms_device_t *device, bool dir_tx,
-                                    size_t chan, bool enabled);
+                                    size_t chan, bool enable);
 
 /**
  * Set up digital LPF using LMS chip GFIRS. This is a convenience function to
@@ -402,9 +486,6 @@ API_EXPORT int CALL_CONV LMS_SetGFIRLPF(lms_device_t *device, bool dir_tx,
  * calibration must be run after device configuration is finished because
  * calibration values are dependant on various configuration settings.
  *
- * @note automatic RX calibration is not available when RX_LNA_H path is
- * selected
- *
  * @pre Device should be configured
  *
  * @param   device      Device handle previously obtained by LMS_Open().
@@ -421,6 +502,10 @@ API_EXPORT int CALL_CONV LMS_Calibrate(lms_device_t *device, bool dir_tx,
 /**
  * Load LMS chip configuration from a file
  *
+ * @note this only loads LMS chip configuration, in oder for streaming to work
+ * properly FPGA has also to be configured. Use LMS_SetSampleRate() to configure
+ * LMS and FPGA for streaming.
+ *
  * @param   device      Device handle
  * @param   filename    path to file
  *
@@ -432,13 +517,12 @@ API_EXPORT int CALL_CONV LMS_LoadConfig(lms_device_t *device, const char *filena
  * Save LMS chip configuration to a file
  *
  * @param   device      Device handle
- * @param   module      path to file with LMS chip configuration
+ * @param   filename    path to file with LMS chip configuration
  *
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_SaveConfig(lms_device_t *device, const char *filename);
 
-
 /**
  * Apply the specified test signal
  *
@@ -468,7 +552,6 @@ API_EXPORT int CALL_CONV LMS_GetTestSignal(lms_device_t *device, bool dir_tx,
 
 /** @} (End FN_HIGH_LVL) */
 
-
 /**
  * @defgroup FN_ADVANCED    Advanced control functions
  *
@@ -479,7 +562,7 @@ API_EXPORT int CALL_CONV LMS_GetTestSignal(lms_device_t *device, bool dir_tx,
  * @{
  */
 
-/**Enumeration of LMS7 GFIRS*/
+///Enumeration of LMS7 GFIRS
 typedef enum
 {
     LMS_GFIR1 = 0,
@@ -487,68 +570,8 @@ typedef enum
     LMS_GFIR3
 }lms_gfir_t;
 
-
-/**Number of NCO frequency/phase offset values*/
-const size_t LMS_NCO_VAL_COUNT = 16;
-
-
-/** Convenience type for fixed length name string*/
-typedef char lms_name_t[16];
-
-/**
- * Obtain antenna list with names. First item in the list is the name of antenna
- * index 0.
- *
- * @param       device      Device handle previously obtained by LMS_Open().
- * @param       dir_tx      Select RX or TX
- * @param       chan        channel index
- * @param[out]  list        List of antenna names (can be NULL)
- *
- * @return      number of available antennae, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GetAntennaList(lms_device_t *device, bool dir_tx,
-                                        size_t chan, lms_name_t *list);
-
-/**
- * Select the antenna for the specified RX or TX channel.
- *
- * LMS_SetFrequency() automatically selects antenna based on frequency. This
- * function is meant to override path selected by LMS_SetFrequency() and should
- * be called after LMS_SetFrequency().
- *
- * @param       device      Device handle previously obtained by LMS_Open().
- * @param       dir_tx      Select RX or TX
- * @param       chan        channel index
- * @param       index       Index of antenna to select
- *
- * @return      0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_SetAntenna(lms_device_t *device, bool dir_tx,
-                                        size_t chan, size_t index);
-
-/**
- * Obtain currently selected antenna of the the specified RX or TX channel.
- *
- * @param       dev        Device handle previously obtained by LMS_Open().
- * @param       dir_tx     Select RX or TX
- * @param       chan       channel index
- *
- * @return     Index of selected antenna on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GetAntenna(lms_device_t *device, bool dir_tx, size_t chan);
-
-/**
- * Obtains bandwidth (lower and upper frequency) of the specified antenna
- *
- * @param       dev        Device handle previously obtained by LMS_Open().
- * @param       dir_tx     Select RX or TX
- * @param       chan       channel index
- * @param       index      Antenna index
- * @param[out]  range      Antenna bandwidth
- *
- * @return      0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GetAntennaBW(lms_device_t *device, bool dir_tx, size_t chan, size_t index, lms_range_t *range);
+///Number of NCO frequency/phase offset values
+static const int LMS_NCO_VAL_COUNT = 16;
 
 /**
  * Set sampling rate for all RX or TX channels. Sample rate is in complex
@@ -567,6 +590,7 @@ API_EXPORT int CALL_CONV LMS_GetAntennaBW(lms_device_t *device, bool dir_tx, siz
  * @param[in]   device      Device handle previously obtained by LMS_Open().
  * @param       dir_tx      Select RX or TX
  * @param       rate        Sampling rate in Hz to set
+ * @param       oversample  RF oversampling ratio.
  *
  * @return      0 on success, (-1) on failure
  */
@@ -579,7 +603,7 @@ API_EXPORT int CALL_CONV LMS_SetSampleRateDir(lms_device_t *device, bool dir_tx,
  * Automatically starts NCO with frequency at index 0
  * Use LMS_SetNCOindex() to switch between NCO frequencies.
  *
- * @param       dev        Device handle previously obtained by LMS_Open().
+ * @param       device     Device handle previously obtained by LMS_Open().
  * @param       dir_tx     Select RX or TX
  * @param       chan       Channel index
  * @param[in]   freq       List of NCO frequencies. Values cannot be negative.
@@ -594,12 +618,12 @@ API_EXPORT int CALL_CONV LMS_SetNCOFrequency(lms_device_t *device, bool dir_tx,
 /**
  * Get the current NCO FCW mode configuration.
  *
- * @param       dev        Device handle previously obtained by LMS_Open().
+ * @param       device     Device handle previously obtained by LMS_Open().
  * @param       dir_tx     Select RX or TX
  * @param       chan       Channel index
  * @param[out]  freq       List of NCO frequencies. Must be at least
  *                         ::LMS_NCO_VAL_COUNT length;
- * @param[out]  pho1       Phase offset in deg
+ * @param[out]  pho        Phase offset in deg
  *
  * @return      0 on success, (-1) on failure
  */
@@ -612,7 +636,7 @@ API_EXPORT int CALL_CONV LMS_GetNCOFrequency(lms_device_t *device, bool dir_tx,
  * Automatically starts NCO with phase at index 0
  * Use LMS_SetNCOindex() to switch between NCO phases.
  *
- * @param       dev        Device handle previously obtained by LMS_Open().
+ * @param       device     Device handle previously obtained by LMS_Open().
  * @param       dir_tx     Select RX or TX
  * @param       chan       Channel index
  * @param[in]   phases     List of NCO phases. Values cannot be negative.
@@ -624,26 +648,40 @@ API_EXPORT int CALL_CONV LMS_GetNCOFrequency(lms_device_t *device, bool dir_tx,
 API_EXPORT int CALL_CONV LMS_SetNCOPhase(lms_device_t *device, bool dir_tx,
                    size_t chan, const float_type *phases, float_type fcw);
 
+/**
+ * Get the current NCO PHO mode configuration.
+ *
+ * @param       device    Device handle previously obtained by LMS_Open().
+ * @param       dir_tx    Select RX or TX
+ * @param       chan      channel index
+ * @param[out]  phases    List of configured NCO phases
+ *                        Must be at least ::LMS_NCO_VAL_COUNT length;
+ * @param[out]  fcw       Current NCO frequency
+ *
+ * @return      0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetNCOPhase(lms_device_t *device, bool dir_tx,
+                            size_t chan, float_type *phases, float_type *fcw);
 
 /**
  * Switches between configured list of NCO frequencies/phase offsets. Also
  * Allows to switch CMIX mode to either downconvert or upconvert.
  *
- * @param dev       Device handle previously obtained by LMS_Open().
+ * @param device    Device handle previously obtained by LMS_Open().
  * @param dir_tx    Select RX or TX
  * @param chan      channel index
- * @param index     NCO frequency/phase index to activate
+ * @param index     NCO frequency/phase index to activate or (-1) to disable NCO
  * @param downconv  true(1) CMIX downconvert, false(0) CMIX upconvert
  *
  * @return 0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_SetNCOIndex(lms_device_t *device, bool dir_tx,
-                                    size_t chan, size_t index, bool downconv);
+                                    size_t chan, int index, bool downconv);
 
 /**
  * Get the currently active NCO frequency/phase offset index
  *
- * @param       dev       Device handle previously obtained by LMS_Open().
+ * @param       device    Device handle previously obtained by LMS_Open().
  * @param       dir_tx    Select RX or TX
  * @param       chan      Channel index
  *
@@ -652,46 +690,11 @@ API_EXPORT int CALL_CONV LMS_SetNCOIndex(lms_device_t *device, bool dir_tx,
 API_EXPORT int CALL_CONV LMS_GetNCOIndex(lms_device_t *device, bool dir_tx,
                                         size_t chan);
 
-/**
- * Read device parameter. Parameter defines specific bits in device register.
- *
- * @param device    Device handle previously obtained by LMS_Open().
- * @param param     Parameter.
- * @param val       Current parameter value.
- *
- * @return  0 on success, (-1) on failure
- */
-
-/**
- * Write device parameter. Parameter defines specific bits in device register.
- *
- * @param device    Device handle previously obtained by LMS_Open().
- * @param param     Parameter.
- * @param val       Parameter value to write
- *
- * @return  0 on success, (-1) on failure
- */
-
-/**
- * Generates LPF coefficients for LMS GFIR.
- * Pass and stop band frequencies are relative to sampling rate.
- *
- * @param      n        number of coefficients to generate.
- * @param      w1       Relative pass band frequency. Range [0, 0.5].
- * @param      w2       Relative Stop band frequency. Range [w1, 0.5].
- * @param      g_stop   Stop_band gain. Range [0, 0.5].
- * @param[out] coef     generated filter coefficients
- *
- * @return      0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GenerateLPFCoef(size_t n, float_type w1,
-                        float_type w2, float_type g_stop, float_type *coef);
-
 /**
  * Configure LMS GFIR using specified filter coefficients. Maximum number of
  * coefficients is 40 for GFIR1 and GFIR2, and 120 for GFIR3.
  *
- * @param       dev       Device handle previously obtained by LMS_Open().
+ * @param       device       Device handle previously obtained by LMS_Open().
  * @param       dir_tx    Select RX or TX
  * @param       chan      Channel index
  * @param       filt      GFIR to configure
@@ -706,7 +709,7 @@ API_EXPORT int CALL_CONV LMS_SetGFIRCoeff(lms_device_t * device, bool dir_tx,
 /**
  * Get currently set GFIR coefficients.
  *
- * @param       dev       Device handle previously obtained by LMS_Open().
+ * @param       device       Device handle previously obtained by LMS_Open().
  * @param       dir_tx    Select RX or TX
  * @param       chan      Channel index
  * @param       filt      GFIR to configure
@@ -721,7 +724,7 @@ API_EXPORT int CALL_CONV LMS_GetGFIRCoeff(lms_device_t * device, bool dir_tx,
 /**
  * Enables or disables specified GFIR.
  *
- * @param dev       Device handle previously obtained by LMS_Open().
+ * @param device    Device handle previously obtained by LMS_Open().
  * @param dir_tx    Select RX or TX
  * @param chan      Channel index
  * @param filt      GFIR to configure
@@ -733,8 +736,31 @@ API_EXPORT int CALL_CONV LMS_SetGFIR(lms_device_t * device, bool dir_tx,
                                     size_t chan, lms_gfir_t filt, bool enabled);
 
 /**
- * @defgroup FN_LOW_LVL    Low-Level control functions
+ * Write value to VCTCXO trim DAC. Used to adjust/calibrate reference clock
+ * generated by voltage controlled oscillator.
+ * @note calling this functions switches clock source to VCTCXO
+ *
+ * @param   dev         Device handle previously obtained by LMS_Open().
+ * @param   val         Value to write to VCTCXO trim DAC, range 0-255
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_VCTCXOWrite(lms_device_t * dev, uint16_t val);
+
+/**
+ * Read value from VCTCXO trim DAC.
  *
+ * @param[in]   dev     Device handle previously obtained by LMS_Open().
+ * @param[out]  val     Value to read from VCTCXO trim DAC
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_VCTCXORead(lms_device_t * dev, uint16_t *val);
+
+/** @} (End FN_ADVANCED) */
+
+/**
+ * @defgroup FN_LOW_LVL    Low-Level control functions
  * @{
  */
 
@@ -758,7 +784,7 @@ API_EXPORT int CALL_CONV LMS_Reset(lms_device_t *device);
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_ReadLMSReg(lms_device_t *device, uint32_t address,
-                                     uint16_t *val);
+                                        uint16_t *val);
 
 /**
  * Write device LMS chip register
@@ -770,16 +796,7 @@ API_EXPORT int CALL_CONV LMS_ReadLMSReg(lms_device_t *device, uint32_t address,
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_WriteLMSReg(lms_device_t *device, uint32_t address,
-                                      uint16_t val);
-
-/**
- * Perform register test
- *
- * @param device    Device handle previously obtained by LMS_Open().
- *
- * @return  0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_RegisterTest(lms_device_t *device);
+                                        uint16_t val);
 
 /**
  * Read device FPGA register
@@ -791,7 +808,7 @@ API_EXPORT int CALL_CONV LMS_RegisterTest(lms_device_t *device);
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_ReadFPGAReg(lms_device_t *device, uint32_t address,
-                                     uint16_t *val);
+                                        uint16_t *val);
 
 /**
  * Write device FPGA register
@@ -803,7 +820,7 @@ API_EXPORT int CALL_CONV LMS_ReadFPGAReg(lms_device_t *device, uint32_t address,
  * @return  0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_WriteFPGAReg(lms_device_t *device, uint32_t address,
-                                      uint16_t val);
+                                        uint16_t val);
 
 /**
  * Read custom parameter from board
@@ -831,105 +848,19 @@ API_EXPORT int CALL_CONV LMS_ReadCustomBoardParam(lms_device_t *device,
 API_EXPORT int CALL_CONV LMS_WriteCustomBoardParam(lms_device_t *device,
                             uint8_t id, float_type val, const lms_name_t units);
 
-/**
- * Changes device reference clock used by API for various calculations.
- * Normally reference clock should be detected automatically based on device.
- * Use this function in case you have replaced the reference crystal.
- *
- * @param device      Device handle previously obtained by LMS_Open().
- * @param clock_Hz    reference clock in Hz.
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_SetReferenceClock(lms_device_t * device,
-                                               float_type clock_Hz);
-
-/**
- * Get the currently set reference clock
- *
- * @param device      Device handle previously obtained by LMS_Open().
- * @param clock_Hz    reference clock in Hz.
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GetReferenceClock(lms_device_t * device,
-                                               float_type * clock_Hz);
-
-/**
- * Write value to VCTCXO trim DAC
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   val         Value to write to VCTCXO trim DAC
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_VCTCXOWrite(lms_device_t * dev, uint16_t val);
-
-/**
- * Read value from VCTCXO trim DAC.
- *
- * @param[in]   dev     Device handle previously obtained by LMS_Open().
- * @param[out]  val     Value to read from VCTCXO trim DAC
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_VCTCXORead(lms_device_t * dev, uint16_t *val);
-
-/**
- * Get VCO value range.
- *
- * @param   dev     Device handle previously obtained by LMS_Open().
- * @param   vco_id  VCO identifier
- * @param   range   VCO range
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_GetVCORange(lms_device_t * dev, size_t vco_id,
-                                         lms_range_t* range);
-
-/**
- * Set VCO value range.
- *
- * @param   dev     Device handle previously obtained by LMS_Open().
- * @param   vco_id  VCO identifier
- * @param   range   VCO range
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_SetVCORange(lms_device_t * dev, size_t vco_id,
-                                         lms_range_t range);
-
-/**
- * @brief Sets callback for logging data write/read operations
- *
- * @param   dev     Device handle previously obtained by LMS_Open().
- * @param   func    callback function
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_SetDataLogCallback(lms_device_t *dev, void (*func)(bool tx, const unsigned char* data, const unsigned int length));
-
-/**
- * @brief Sets callback for logging info/warning/error messages
- *
- * @param   dev     Device handle previously obtained by LMS_Open().
- * @param   func    callback function
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_SetLogCallback(lms_device_t *dev, void (*func)(const char* cstr, const unsigned int type));
-
 /**
  * @defgroup LMS_CLOCK_ID   Clock definitions
  *
  * Clock definitions for accessing specific internal clocks
  * @{
  */
-#define LMS_CLOCK_REF   0x0000  /**<Chip reference clock*/
-#define LMS_CLOCK_SXR   0x0001  /**<RX LO clock*/
-#define LMS_CLOCK_SXT   0x0002  /**<TX LO clock*/
-#define LMS_CLOCK_CGEN  0x0003  /**<CGEN clock*/
-#define LMS_CLOCK_RXTSP 0x0004  /**<RXTSP reference clock*/
-#define LMS_CLOCK_TXTSP 0x0005  /**TXTSP reference clock*/
-
+#define LMS_CLOCK_REF    0x0000  ///<Chip reference clock
+#define LMS_CLOCK_SXR    0x0001  ///<RX LO clock
+#define LMS_CLOCK_SXT    0x0002  ///<TX LO clock
+#define LMS_CLOCK_CGEN   0x0003  ///<CGEN clock
+#define LMS_CLOCK_RXTSP  0x0004  ///<RXTSP reference clock
+#define LMS_CLOCK_TXTSP  0x0005  ///<TXTSP reference clock
+#define LMS_CLOCK_EXTREF 0x0006  ///<External reference clock
 
 /** @} (End LMS_CLOCK_ID) */
 
@@ -948,6 +879,9 @@ API_EXPORT int CALL_CONV LMS_GetClockFreq(lms_device_t *dev, size_t clk_id,
 /**
  * Set frequency of the specified clock
  *
+ * @note setting ::LMS_CLOCK_EXTREF changes clock source to external, use
+ * ::LMS_VCTCXOWrite() to change back to VCTCXO
+ *
  * @param   dev     Device handle previously obtained by LMS_Open().
  * @param   clk_id  Clock identifier
  * @param   freq    Clock frequency in Hz. Pass zero or negative value to only
@@ -958,91 +892,6 @@ API_EXPORT int CALL_CONV LMS_GetClockFreq(lms_device_t *dev, size_t clk_id,
 API_EXPORT int CALL_CONV LMS_SetClockFreq(lms_device_t *dev, size_t clk_id,
                                          float_type freq);
 
-/**
- * Load Si5351C configuration from file
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   filename    file containing Si5351C configuration
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_LoadConfigSi5351C(lms_device_t *dev,
-                                                const char* filename);
-
-/**
- * Configure Si5351C frequencies
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   clkin       PLLs input clock frequency.
- * @param   clks        output clock frequencies (must be 8).
- *                      0 - disabled, negative - inverted
- * @param   src         input clock source 0-XTAL, 1-CLKIN
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_ConfigureSi5351C(lms_device_t *dev,
-                   float_type clkin, float_type *clks, uint32_t src);
-
-
-/**
- * Get Si5351C status bits
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   status      Status bits. Pass Null to clear status bits
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_StatusSi5351C(lms_device_t *dev, uint32_t *status);
-
-
-typedef struct
-{
-    double fRef;
-    double fVCO;
-    //Reference counter latch
-    unsigned lockDetectPrec;   /**<3 cycles (0), or 5 cycles (1)*/
-    unsigned antiBacklash;     /**<2.9ns (0), 6ns (1)*/
-    unsigned referenceCounter; /**<range [0, 16383]*/
-    //N counter latch
-    unsigned cpGain;           /**<0 or 1*/
-    unsigned nCounter;         /**<range [0, 8191]*/
-    //Function latch
-    unsigned flCurrent1;
-    unsigned flCurrent2;
-    unsigned flTimerCounter;
-    unsigned flFastlock;
-    unsigned flMuxCtrl;
-    unsigned flPDPolarity;
-    unsigned flPD1;
-    unsigned flPD2;
-    unsigned flCounterReset;
-    unsigned flCPState;
-    //Initialization latch
-    unsigned ilCurrent1;
-    unsigned ilCurrent2;
-    unsigned ilTimerCounter;
-    unsigned ilFastlock;
-    unsigned ilMuxCtrl;
-    unsigned ilPDPolarity;
-    unsigned ilPD1;
-    unsigned ilPD2;
-    unsigned ilCounterReset;
-    unsigned ilCPState;
-    //Extra
-    uint32_t flags;
-
-}lms_adf4002_conf_t;
-
-/**
- * Get Si5351C status bits
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   config      ADF4002 configuration structure ::lms_adf4002_conf_t
- *
- * @return 0 on success, (-1) on failure
- */
-API_EXPORT int CALL_CONV LMS_ConfigureADF4002(lms_device_t *dev, lms_adf4002_conf_t *config);
-
 /**
  * Synchronizes register values between API cache and chip
  *
@@ -1053,41 +902,44 @@ API_EXPORT int CALL_CONV LMS_ConfigureADF4002(lms_device_t *dev, lms_adf4002_con
  */
 API_EXPORT int CALL_CONV LMS_Synchronize(lms_device_t *dev, bool toChip);
 
-
 /**
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   buffer      read values
- * @param   len         number of bytes to read
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param[in]   buffer  read values (8 GPIO values per byte, LSB first)
+ * @param       len     number of bytes to read
  *
  * @return 0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_GPIORead(lms_device_t *dev, uint8_t* buffer, size_t len);
 
 /**
- *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   buffer      values to write
- * @param   len         number bytes to write
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param[out]  buffer  values to write (8 GPIO values per byte, LSB first)
+ * @param       len     number of bytes to write
  *
  * @return 0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_GPIOWrite(lms_device_t *dev, const uint8_t* buffer, size_t len);
 
 /**
- * Low-level data transfer using LMS64C protocol
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param[out]  buffer  GPIO direction configuration(8 GPIO per byte, LSB first; 0 input, 1 output)
+ * @param       len     number of bytes to read
  *
- * @param   dev         Device handle previously obtained by LMS_Open().
- * @param   cmd         command
- * @param   data        in/out data
- * @param   len         data length
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GPIODirRead(lms_device_t *dev, uint8_t* buffer, size_t len);
+
+/**
+ * @param       dev     Device handle previously obtained by LMS_Open().
+ * @param[in]   buffer  GPIO direction configuration(8 GPIO per byte, LSB first; 0 input, 1 output)
+ * @param       len     number of bytes to write
  *
  * @return 0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_TransferLMS64C(lms_device_t *dev, int cmd, uint8_t* data, size_t *len);
+API_EXPORT int CALL_CONV LMS_GPIODirWrite(lms_device_t *dev, const uint8_t* buffer, size_t len);
 
 /**
- *  Enables or disable caching of calibration values
+ *  Enables or disable caching of calibration values.
  *
  * @param   dev         Device handle previously obtained by LMS_Open().
  * @param   enable      true to enable cache
@@ -1108,12 +960,8 @@ API_EXPORT int CALL_CONV LMS_EnableCalibCache(lms_device_t *dev, bool enable);
 API_EXPORT int CALL_CONV LMS_GetChipTemperature(lms_device_t *dev, size_t ind,
                                                 float_type *temp);
 
-
 /** @} (End FN_LOW_LVL) */
 
-/** @} (End FN_ADVANCED) */
-
-
 /**
  * @defgroup FN_STREAM    Sample Streaming functions
  * The functions in this section provides support for sending and receiving
@@ -1124,7 +972,8 @@ API_EXPORT int CALL_CONV LMS_GetChipTemperature(lms_device_t *dev, size_t ind,
 /**Metadata structure used in sample transfers*/
 typedef struct
 {
-    /**Timestamp is a value of HW counter with a tick based on sample rate.
+    /**
+     * Timestamp is a value of HW counter with a tick based on sample rate.
      * In RX: time when the first sample in the returned buffer was received
      * In TX: time when the first sample in the submitted buffer should be send
      */
@@ -1137,9 +986,9 @@ typedef struct
      */
     bool waitForTimestamp;
 
-    /**Indicates the end of send/receive transaction. Discards data remainder
-     * in buffer (if there is any) in RX or flushes transfer buffer in TX (even
-     * if the buffer is not full yet).*/
+    /**Indicates the end of send/receive transaction. Currently has no effect
+     * @todo force send samples to HW (ignore transfer size) when selected
+     */
     bool flushPartialPacket;
 
 }lms_stream_meta_t;
@@ -1147,9 +996,9 @@ typedef struct
 /**Stream structure*/
 typedef struct
 {
-    /**Stream handle. Should not be modified manually.
-     * Assigned by LMS_SetupStream().
-     */
+    /**
+     * Stream handle. Should not be modified manually.
+     * Assigned by LMS_SetupStream().*/
     size_t handle;
 
     //! Indicates whether stream is TX (true) or RX (false)
@@ -1161,7 +1010,8 @@ typedef struct
     //! FIFO size (in samples) used by stream.
     uint32_t fifoSize;
 
-    /**Parameter for controlling configuration bias toward low latency or high
+    /**
+     * Parameter for controlling configuration bias toward low latency or high
      * data throughput range [0,1.0].
      * 0 - lowest latency, usually results in lower throughput
      * 1 - higher throughput, usually results in higher latency
@@ -1171,32 +1021,32 @@ typedef struct
     //! Data output format
     enum
     {
-        LMS_FMT_F32=0,    /**<32-bit floating point*/
-        LMS_FMT_I16,      /**<16-bit integers*/
-        LMS_FMT_I12       /**<12-bit integers stored in 16-bit variables*/
+        LMS_FMT_F32=0,    ///<32-bit floating point
+        LMS_FMT_I16,      ///<16-bit integers
+        LMS_FMT_I12       ///<12-bit integers stored in 16-bit variables
     }dataFmt;
 }lms_stream_t;
 
 /**Streaming status structure*/
 typedef struct
 {
-    /**Indicates whether the stream is currently active*/
+    ///Indicates whether the stream is currently active
     bool active;
-    /**Number of samples in FIFO buffer*/
+    ///Number of samples in FIFO buffer
     uint32_t fifoFilledCount;
-    /**Size of FIFO buffer*/
+    ///Size of FIFO buffer
     uint32_t fifoSize;
-    /**FIFO underrun count*/
+    ///FIFO underrun count
     uint32_t underrun;
-    /**FIFO overrun count*/
+    ///FIFO overrun count
     uint32_t overrun;
-    /**Number of dropped packets by HW*/
+    ///Number of dropped packets by HW
     uint32_t droppedPackets;
-    /**Sampling rate of the stream*/
+    ///Sampling rate of the stream
     float_type sampleRate;
-    /**Combined data rate of all stream of the same direction (TX or RX)*/
+    ///Combined data rate of all stream of the same direction (TX or RX)
     float_type linkRate;
-    /**Current HW timestamp*/
+    ///Current HW timestamp
     uint64_t timestamp;
 
 } lms_stream_status_t;
@@ -1213,13 +1063,14 @@ typedef struct
 API_EXPORT int CALL_CONV LMS_SetupStream(lms_device_t *device, lms_stream_t *stream);
 
 /**
- * Deallocate memory used for stream.
- * @todo
- * @param stream Stream structure previously initialized with LMS_SetupStream().
+ * Deallocate memory used by stream.
+ *
+ * @param dev       Device handle previously obtained by LMS_Open().
+ * @param stream    Stream structure previously initialized with LMS_SetupStream().
  *
  * @return 0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_DestroyStream(lms_device_t *device, lms_stream_t *stream);
+API_EXPORT int CALL_CONV LMS_DestroyStream(lms_device_t *dev, lms_stream_t *stream);
 
 /**
  * Start stream
@@ -1230,7 +1081,6 @@ API_EXPORT int CALL_CONV LMS_DestroyStream(lms_device_t *device, lms_stream_t *s
  */
 API_EXPORT int CALL_CONV LMS_StartStream(lms_stream_t *stream);
 
-
 /**
  * Stop stream
  *
@@ -1238,7 +1088,7 @@ API_EXPORT int CALL_CONV LMS_StartStream(lms_stream_t *stream);
  *
  * @return 0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_StopStream(lms_stream_t *conf);
+API_EXPORT int CALL_CONV LMS_StopStream(lms_stream_t *stream);
 
 /**
  * Read samples from the FIFO of the specified stream.
@@ -1248,7 +1098,7 @@ API_EXPORT int CALL_CONV LMS_StopStream(lms_stream_t *conf);
  * @param samples       sample buffer.
  * @param sample_count  Number of samples to read
  * @param meta          Metadata. See the ::lms_stream_meta_t description.
- * @param timeout_ms    how long to wait for data before timing out(0=infinite).
+ * @param timeout_ms    how long to wait for data before timing out.
  *
  * @return number of samples received on success, (-1) on failure
  */
@@ -1272,7 +1122,7 @@ API_EXPORT int CALL_CONV LMS_GetStreamStatus(lms_stream_t *stream, lms_stream_st
  * @param samples       sample buffer.
  * @param sample_count  Number of samples to write
  * @param meta          Metadata. See the ::lms_stream_meta_t description.
- * @param timeout_ms    how long to wait for data before timing out(0=infinite).
+ * @param timeout_ms    how long to wait for data before timing out.
  *
  * @return number of samples send on success, (-1) on failure
  */
@@ -1280,28 +1130,29 @@ API_EXPORT int CALL_CONV LMS_SendStream(lms_stream_t *stream,
                             const void *samples,size_t sample_count,
                             const lms_stream_meta_t *meta, unsigned timeout_ms);
 
-/** @brief Uploads waveform to on board memory for later use
+/**
+ * Uploads waveform to on board memory for later use
  * @param device        Device handle previously obtained by LMS_Open().
  * @param samples       multiple channel samples data
  * @param chCount       number of waveform channels
  * @param sample_count  number of samples in each channel
  * @param format        waveform data format
- * @return  0 on success
+ * @return              0 on success, (-1) on failure
  */
 API_EXPORT int CALL_CONV LMS_UploadWFM(lms_device_t *device, const void **samples,
-							uint8_t chCount, size_t sample_count, int format);
+                                uint8_t chCount, size_t sample_count, int format);
 
-/** @brief Enables/Disables transmitting of uploaded waveform
+/**
+ * Enables/Disables transmitting of uploaded waveform
  * @param device    Device handle previously obtained by LMS_Open().
+ * @param chan      Channel index
  * @param active    Enable/Disable waveform playback
- * @return  0 on success
+ * @return          0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_EnableTxWFM(lms_device_t *device, const bool active);
-
+API_EXPORT int CALL_CONV LMS_EnableTxWFM(lms_device_t *device, unsigned chan, bool active);
 
 /** @} (End FN_STREAM) */
 
-
 /**
  * @defgroup FN_VERSION   Version and update functions
  *
@@ -1310,70 +1161,24 @@ API_EXPORT int CALL_CONV LMS_EnableTxWFM(lms_device_t *device, const bool active
  * @{
  */
 
-/**Enumeration of device programming target*/
+/**Enumeration of programming mode*/
 typedef enum
 {
-    LMS_TARGET_RAM = 0,    /**<load firmware/bitstream to volatile storage*/
-    LMS_TARGET_FLASH = 1,  /**<load firmware/bitstream to non-volatile storage*/
-    LMS_TARGET_BOOT = 2    /**<reset and boot from flash*/
-}lms_target_t;
+    LMS_PROG_MD_RAM = 0,   ///<load firmware/bitstream to volatile storage
+    LMS_PROG_MD_FLASH = 1, ///<load firmware/bitstream to non-volatile storage
+    LMS_PROG_MD_RST = 2    ///<reset and boot from flash
+}lms_prog_md_t;
 
-
-
-/**Device information structure*/
-typedef struct
+/**Enumeration of programmable board modules*/
+typedef enum
 {
-    //! The displayable name for the device
-    char deviceName[32];
-
-    /*! The displayable name for the expansion card
-     */
-    char expansionName[32];
-
-    //! The firmware version as a string
-    char firmwareVersion[16];
-
-    //! The hardware version as a string
-    char hardwareVersion[16];
-
-    //! The protocol version as a string
-    char protocolVersion[16];
-
-    //! A unique board serial number
-    uint32_t boardSerialNumber;
-
-    //! Gateware version as a string
-    char gatewareVersion[16];
-    //! Gateware revision as a string
-    char gatewareRevision[16];
-    //! Which board should use this gateware
-    char gatewareTargetBoard[32];
-}lms_dev_info_t;
+    LMS_PROG_TRG_FX3 = 0,   ///<program FX3 firmware
+    LMS_PROG_TRG_FPGA,      ///<program FPGA gateware
+    LMS_PROG_TRG_MCU,       ///<program LMS7 MCU firmware
+    LMS_PROG_TRG_HPM7,
+}lms_prog_trg_t;
 
 /**
- * Get device serial number and version information
- *
- * @note This function returns pointer to internal data structure that gets
- * deallocated when device is closed. Do not attempt to read from it after
- * closing the device. If you need to keep using device info returned by this
- * function after closing the device, make a copy before closing the device.
- *
- * @param device    Device handle previously obtained by LMS_Open().
- * @return          pointer to device info structure
- */
-API_EXPORT const lms_dev_info_t* CALL_CONV LMS_GetDeviceInfo(lms_device_t *device);
-
-/**
- * @brief Returns API library build type
-*/
-API_EXPORT const char* LMS_GetBuildTimestamp();
-
-/**
-* @brief Returns API library version
-*/
-API_EXPORT const char* LMS_GetLibraryVersion();
-
-/*!
  * Callback from programming processes
  * @param bsent number of bytes transferred
  * @param btotal total number of bytes to send
@@ -1382,32 +1187,64 @@ API_EXPORT const char* LMS_GetLibraryVersion();
  */
 typedef bool (*lms_prog_callback_t)(int bsent, int btotal, const char* progressMsg);
 
-
 /**
- * Boots LMS7 internal MCU from flash memory.
+ * Write binary firmware/bitsteam image to specified device component.
  *
  * @param device    Device handle previously obtained by LMS_Open().
+ * @param data      Pointer to memory containing firmware/bitsteam image
+ * @param size      Size of firmware/bitsteam image in bytes.
+ * @param target   device component to program ::lms_prog_trg_t
+ * @param mode      programming mode ::lms_prog_md_t
+ * @param callback  callback function for monitoring progress
  *
  * @return          0 on success, (-1) on failure
  */
-API_EXPORT int CALL_CONV LMS_ResetLMSMCU(lms_device_t *device);
-
-/** @} (End FN_VERSION) */
+API_EXPORT int CALL_CONV LMS_Program(lms_device_t *device, const char *data, size_t size,
+           lms_prog_trg_t target, lms_prog_md_t mode, lms_prog_callback_t callback);
 
 /**
- * @defgroup FN_ERRORS    Error reporting
+ * Automatically update device firmware
  *
- * LMS API functions return 0 or positive value on success and (-1) on failure.
- * The functions in this section provides ability to get more detailed
- * error descriptions.
- * @{
+ * @param dev       Device handle previously obtained by LMS_Open().
+ * @param download  True to download missing images from the web.
+ * @param callback  callback function for monitoring progress
+ *
+ * @return          0 on success, (-1) on failure
  */
+API_EXPORT int CALL_CONV LMS_ProgramUpdate(lms_device_t *dev, bool download,
+                                           lms_prog_callback_t callback);
+
+/**Device information structure*/
+typedef struct
+{
+    char deviceName[32];            ///<The display name of the device
+    char expansionName[32];         ///<The display name of the expansion card
+    char firmwareVersion[16];       ///<The firmware version as a string
+    char hardwareVersion[16];       ///<The hardware version as a string
+    char protocolVersion[16];       ///<The protocol version as a string
+    uint32_t boardSerialNumber;     ///<A unique board serial number
+    char gatewareVersion[16];       ///<Gateware version as a string
+    char gatewareRevision[16];      ///<Gateware revision as a string
+    char gatewareTargetBoard[32];   ///<Which board should use this gateware
+}lms_dev_info_t;
 
 /**
- * Get the last error code. Error codes are as defined in errno.h
- * @return last error code
+ * Get device serial number and version information
+ *
+ * @note This function returns pointer to internal data structure that gets
+ * deallocated when device is closed. Do not attempt to read from it after
+ * closing the device. If you need to keep using device info returned by this
+ * function after closing the device, make a copy before closing the device.
+ *
+ * @param device    Device handle previously obtained by LMS_Open().
+ * @return          pointer to device info structure ::lms_dev_info_t
  */
-API_EXPORT int CALL_CONV LMS_GetLastError(void);
+API_EXPORT const lms_dev_info_t* CALL_CONV LMS_GetDeviceInfo(lms_device_t *device);
+
+/**
+* @brief Returns API library version
+*/
+API_EXPORT const char* LMS_GetLibraryVersion();
 
 /**
  * Get the error message detailing why the last error occurred.
@@ -1416,7 +1253,7 @@ API_EXPORT int CALL_CONV LMS_GetLastError(void);
  */
 API_EXPORT const char * CALL_CONV LMS_GetLastErrorMessage(void);
 
-/** @} (End FN_ERRORS) */
+/** @} (End FN_VERSION) */
 
 #ifdef __cplusplus
 } //extern "C"
diff --git a/libLimeSuite__proto.m b/libLimeSuite__proto.m
index 157cb8e..d498c30 100644
--- a/libLimeSuite__proto.m
+++ b/libLimeSuite__proto.m
@@ -69,174 +69,157 @@
     error(['Failed to find ' [libname libsuffix] '. Check path().']);
 end
 
-%  int __cdecl LMS_GetDeviceList ( lms_info_str_t * dev_list );
+%  int __cdecl LMS_GetDeviceList ( lms_info_str_t * dev_list ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_GetDeviceList'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'int8Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Open ( lms_device_t ** device , lms_info_str_t info , void * args );
+%  int __cdecl LMS_Open ( lms_device_t ** device , const lms_info_str_t info , void * args ); 
 fcns.thunkname{fcnNum}='int32voidPtrvoidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_Open'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtrPtr', 'int8Ptr', 'voidPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Close ( lms_device_t * device );
+%  int __cdecl LMS_Close ( lms_device_t * device ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_Close'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Disconnect ( lms_device_t * device );
+%  int __cdecl LMS_Disconnect ( lms_device_t * device ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_Disconnect'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  _Bool __cdecl LMS_IsOpen ( lms_device_t * device , int port );
+%  _Bool __cdecl LMS_IsOpen ( lms_device_t * device , int port ); 
 fcns.thunkname{fcnNum}='_BoolvoidPtrint32Thunk';fcns.name{fcnNum}='LMS_IsOpen'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='bool'; fcns.RHS{fcnNum}={'voidPtr', 'int32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Init ( lms_device_t * device );
+%  int __cdecl LMS_Init ( lms_device_t * device ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_Init'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetNumChannels ( lms_device_t * device , _Bool dir_tx );
+%  int __cdecl LMS_GetNumChannels ( lms_device_t * device , _Bool dir_tx ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolThunk';fcns.name{fcnNum}='LMS_GetNumChannels'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_EnableChannel ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enabled );
+%  int __cdecl LMS_EnableChannel ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enabled ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '_BoolThunk'];fcns.name{fcnNum}='LMS_EnableChannel'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetSampleRate ( lms_device_t * device , float_type rate , size_t oversample );
+%  int __cdecl LMS_SetSampleRate ( lms_device_t * device , float_type rate , size_t oversample ); 
 fcns.thunkname{fcnNum}=['int32voidPtrdouble' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_SetSampleRate'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'double', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetSampleRate ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * host_Hz , float_type * rf_Hz );
+%  int __cdecl LMS_GetSampleRate ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * host_Hz , float_type * rf_Hz ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrvoidPtrThunk'];fcns.name{fcnNum}='LMS_GetSampleRate'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr', 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetSampleRateRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range );
+%  int __cdecl LMS_GetSampleRateRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolvoidPtrThunk';fcns.name{fcnNum}='LMS_GetSampleRateRange'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', 'lms_range_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetLOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type frequency );
+%  int __cdecl LMS_SetLOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type frequency ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'doubleThunk'];fcns.name{fcnNum}='LMS_SetLOFrequency'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetLOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * frequency );
+%  int __cdecl LMS_GetLOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * frequency ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetLOFrequency'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetLOFrequencyRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range );
+%  int __cdecl LMS_GetLOFrequencyRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolvoidPtrThunk';fcns.name{fcnNum}='LMS_GetLOFrequencyRange'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', 'lms_range_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetNormalizedGain ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type gain );
+%  int __cdecl LMS_GetAntennaList ( lms_device_t * dev , _Bool dir_tx , size_t chan , lms_name_t * list ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetAntennaList'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'int8Ptr'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_SetAntenna ( lms_device_t * dev , _Bool dir_tx , size_t chan , size_t index ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_SetAntenna'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, u64_type};fcnNum=fcnNum+1;
+%  int __cdecl LMS_GetAntenna ( lms_device_t * dev , _Bool dir_tx , size_t chan ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GetAntenna'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type};fcnNum=fcnNum+1;
+%  int __cdecl LMS_GetAntennaBW ( lms_device_t * dev , _Bool dir_tx , size_t chan , size_t index , lms_range_t * range ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetAntennaBW'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, u64_type, 'lms_range_tPtr'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_SetNormalizedGain ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type gain ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'doubleThunk'];fcns.name{fcnNum}='LMS_SetNormalizedGain'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetNormalizedGain ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * gain );
+%  int __cdecl LMS_SetGaindB ( lms_device_t * device , _Bool dir_tx , size_t chan , unsigned gain ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'uint32Thunk'];fcns.name{fcnNum}='LMS_SetGaindB'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'uint32'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_GetNormalizedGain ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * gain ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetNormalizedGain'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetLPFBW ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type bandwidth );
+%  int __cdecl LMS_GetGaindB ( lms_device_t * device , _Bool dir_tx , size_t chan , unsigned * gain ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetGaindB'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'uint32Ptr'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_SetLPFBW ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type bandwidth ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'doubleThunk'];fcns.name{fcnNum}='LMS_SetLPFBW'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetLPFBW ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * bandwidth );
+%  int __cdecl LMS_GetLPFBW ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * bandwidth ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetLPFBW'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetLPFBWRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range );
+%  int __cdecl LMS_GetLPFBWRange ( lms_device_t * device , _Bool dir_tx , lms_range_t * range ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolvoidPtrThunk';fcns.name{fcnNum}='LMS_GetLPFBWRange'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', 'lms_range_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetLPF ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enabled );
+%  int __cdecl LMS_SetLPF ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enable ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '_BoolThunk'];fcns.name{fcnNum}='LMS_SetLPF'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetGFIRLPF ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enabled , float_type bandwidth );
+%  int __cdecl LMS_SetGFIRLPF ( lms_device_t * device , _Bool dir_tx , size_t chan , _Bool enabled , float_type bandwidth ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '_BooldoubleThunk'];fcns.name{fcnNum}='LMS_SetGFIRLPF'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'bool', 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Calibrate ( lms_device_t * device , _Bool dir_tx , size_t chan , double bw , unsigned flags );
+%  int __cdecl LMS_Calibrate ( lms_device_t * device , _Bool dir_tx , size_t chan , double bw , unsigned flags ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'doubleuint32Thunk'];fcns.name{fcnNum}='LMS_Calibrate'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'double', 'uint32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_LoadConfig ( lms_device_t * device , const char * filename );
+%  int __cdecl LMS_LoadConfig ( lms_device_t * device , const char * filename ); 
 fcns.thunkname{fcnNum}='int32voidPtrcstringThunk';fcns.name{fcnNum}='LMS_LoadConfig'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'cstring'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SaveConfig ( lms_device_t * device , const char * filename );
+%  int __cdecl LMS_SaveConfig ( lms_device_t * device , const char * filename ); 
 fcns.thunkname{fcnNum}='int32voidPtrcstringThunk';fcns.name{fcnNum}='LMS_SaveConfig'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'cstring'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetTestSignal ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_testsig_t sig , int16_t dc_i , int16_t dc_q );
+%  int __cdecl LMS_SetTestSignal ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_testsig_t sig , int16_t dc_i , int16_t dc_q ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'lms_testsig_tint16int16Thunk'];fcns.name{fcnNum}='LMS_SetTestSignal'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'lms_testsig_t', 'int16', 'int16'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetTestSignal ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_testsig_t * sig );
+%  int __cdecl LMS_GetTestSignal ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_testsig_t * sig ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetTestSignal'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'lms_testsig_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetAntennaList ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_name_t * list );
-fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetAntennaList'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'int8Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetAntenna ( lms_device_t * device , _Bool dir_tx , size_t chan , size_t index );
-fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_SetAntenna'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetAntenna ( lms_device_t * device , _Bool dir_tx , size_t chan );
-fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GetAntenna'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetAntennaBW ( lms_device_t * device , _Bool dir_tx , size_t chan , size_t index , lms_range_t * range );
-fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetAntennaBW'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, u64_type, 'lms_range_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetSampleRateDir ( lms_device_t * device , _Bool dir_tx , float_type rate , size_t oversample );
+%  int __cdecl LMS_SetSampleRateDir ( lms_device_t * device , _Bool dir_tx , float_type rate , size_t oversample ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Booldouble' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_SetSampleRateDir'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', 'double', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetNCOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , const float_type * freq , float_type pho );
+%  int __cdecl LMS_SetNCOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , const float_type * freq , float_type pho ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrdoubleThunk'];fcns.name{fcnNum}='LMS_SetNCOFrequency'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr', 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetNCOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * freq , float_type * pho );
+%  int __cdecl LMS_GetNCOFrequency ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * freq , float_type * pho ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrvoidPtrThunk'];fcns.name{fcnNum}='LMS_GetNCOFrequency'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr', 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetNCOPhase ( lms_device_t * device , _Bool dir_tx , size_t chan , const float_type * phases , float_type fcw );
+%  int __cdecl LMS_SetNCOPhase ( lms_device_t * device , _Bool dir_tx , size_t chan , const float_type * phases , float_type fcw ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrdoubleThunk'];fcns.name{fcnNum}='LMS_SetNCOPhase'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr', 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetNCOIndex ( lms_device_t * device , _Bool dir_tx , size_t chan , size_t index , _Bool downconv );
-fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type '' u64_type '_BoolThunk'];fcns.name{fcnNum}='LMS_SetNCOIndex'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, u64_type, 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetNCOIndex ( lms_device_t * device , _Bool dir_tx , size_t chan );
+%  int __cdecl LMS_GetNCOPhase ( lms_device_t * device , _Bool dir_tx , size_t chan , float_type * phases , float_type * fcw ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'voidPtrvoidPtrThunk'];fcns.name{fcnNum}='LMS_GetNCOPhase'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'doublePtr', 'doublePtr'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_SetNCOIndex ( lms_device_t * device , _Bool dir_tx , size_t chan , int index , _Bool downconv ); 
+fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'int32_BoolThunk'];fcns.name{fcnNum}='LMS_SetNCOIndex'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'int32', 'bool'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_GetNCOIndex ( lms_device_t * device , _Bool dir_tx , size_t chan ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GetNCOIndex'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GenerateLPFCoef ( size_t n , float_type w1 , float_type w2 , float_type g_stop , float_type * coef );
-fcns.thunkname{fcnNum}=['int32' u64_type 'doubledoubledoublevoidPtrThunk'];fcns.name{fcnNum}='LMS_GenerateLPFCoef'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={u64_type, 'double', 'double', 'double', 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetGFIRCoeff ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , const float_type * coef , size_t count );
+%  int __cdecl LMS_SetGFIRCoeff ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , const float_type * coef , size_t count ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'lms_gfir_tvoidPtr' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_SetGFIRCoeff'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'lms_gfir_t', 'doublePtr', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetGFIRCoeff ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , float_type * coef );
+%  int __cdecl LMS_GetGFIRCoeff ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , float_type * coef ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'lms_gfir_tvoidPtrThunk'];fcns.name{fcnNum}='LMS_GetGFIRCoeff'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'lms_gfir_t', 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetGFIR ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , _Bool enabled );
+%  int __cdecl LMS_SetGFIR ( lms_device_t * device , _Bool dir_tx , size_t chan , lms_gfir_t filt , _Bool enabled ); 
 fcns.thunkname{fcnNum}=['int32voidPtr_Bool' u64_type 'lms_gfir_t_BoolThunk'];fcns.name{fcnNum}='LMS_SetGFIR'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool', u64_type, 'lms_gfir_t', 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Reset ( lms_device_t * device );
+%  int __cdecl LMS_VCTCXOWrite ( lms_device_t * dev , uint16_t val ); 
+fcns.thunkname{fcnNum}='int32voidPtruint16Thunk';fcns.name{fcnNum}='LMS_VCTCXOWrite'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint16'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_VCTCXORead ( lms_device_t * dev , uint16_t * val ); 
+fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_VCTCXORead'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint16Ptr'};fcnNum=fcnNum+1;
+%  int __cdecl LMS_Reset ( lms_device_t * device ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_Reset'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_ReadLMSReg ( lms_device_t * device , uint32_t address , uint16_t * val );
+%  int __cdecl LMS_ReadLMSReg ( lms_device_t * device , uint32_t address , uint16_t * val ); 
 fcns.thunkname{fcnNum}='int32voidPtruint32voidPtrThunk';fcns.name{fcnNum}='LMS_ReadLMSReg'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32', 'uint16Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_WriteLMSReg ( lms_device_t * device , uint32_t address , uint16_t val );
+%  int __cdecl LMS_WriteLMSReg ( lms_device_t * device , uint32_t address , uint16_t val ); 
 fcns.thunkname{fcnNum}='int32voidPtruint32uint16Thunk';fcns.name{fcnNum}='LMS_WriteLMSReg'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32', 'uint16'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_RegisterTest ( lms_device_t * device );
-fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_RegisterTest'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_ReadFPGAReg ( lms_device_t * device , uint32_t address , uint16_t * val );
+%  int __cdecl LMS_ReadFPGAReg ( lms_device_t * device , uint32_t address , uint16_t * val ); 
 fcns.thunkname{fcnNum}='int32voidPtruint32voidPtrThunk';fcns.name{fcnNum}='LMS_ReadFPGAReg'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32', 'uint16Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_WriteFPGAReg ( lms_device_t * device , uint32_t address , uint16_t val );
+%  int __cdecl LMS_WriteFPGAReg ( lms_device_t * device , uint32_t address , uint16_t val ); 
 fcns.thunkname{fcnNum}='int32voidPtruint32uint16Thunk';fcns.name{fcnNum}='LMS_WriteFPGAReg'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32', 'uint16'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_ReadCustomBoardParam ( lms_device_t * device , uint8_t id , float_type * val , lms_name_t units );
+%  int __cdecl LMS_ReadCustomBoardParam ( lms_device_t * device , uint8_t id , float_type * val , lms_name_t units ); 
 fcns.thunkname{fcnNum}='int32voidPtruint8voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_ReadCustomBoardParam'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8', 'doublePtr', 'int8Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_WriteCustomBoardParam ( lms_device_t * device , uint8_t id , float_type val , const lms_name_t units );
+%  int __cdecl LMS_WriteCustomBoardParam ( lms_device_t * device , uint8_t id , float_type val , const lms_name_t units ); 
 fcns.thunkname{fcnNum}='int32voidPtruint8doublevoidPtrThunk';fcns.name{fcnNum}='LMS_WriteCustomBoardParam'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8', 'double', 'int8Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetReferenceClock ( lms_device_t * device , float_type clock_Hz );
-fcns.thunkname{fcnNum}='int32voidPtrdoubleThunk';fcns.name{fcnNum}='LMS_SetReferenceClock'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetReferenceClock ( lms_device_t * device , float_type * clock_Hz );
-fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_GetReferenceClock'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_VCTCXOWrite ( lms_device_t * dev , uint16_t val );
-fcns.thunkname{fcnNum}='int32voidPtruint16Thunk';fcns.name{fcnNum}='LMS_VCTCXOWrite'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint16'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_VCTCXORead ( lms_device_t * dev , uint16_t * val );
-fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_VCTCXORead'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint16Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetVCORange ( lms_device_t * dev , size_t vco_id , lms_range_t * range );
-fcns.thunkname{fcnNum}=['int32voidPtr' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetVCORange'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', u64_type, 'lms_range_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetVCORange ( lms_device_t * dev , size_t vco_id , lms_range_t range );
-fcns.thunkname{fcnNum}=['int32voidPtr' u64_type 'lms_range_tThunk'];fcns.name{fcnNum}='LMS_SetVCORange'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', u64_type, 'lms_range_t'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetClockFreq ( lms_device_t * dev , size_t clk_id , float_type * freq );
+%  int __cdecl LMS_GetClockFreq ( lms_device_t * dev , size_t clk_id , float_type * freq ); 
 fcns.thunkname{fcnNum}=['int32voidPtr' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetClockFreq'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', u64_type, 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetClockFreq ( lms_device_t * dev , size_t clk_id , float_type freq );
+%  int __cdecl LMS_SetClockFreq ( lms_device_t * dev , size_t clk_id , float_type freq ); 
 fcns.thunkname{fcnNum}=['int32voidPtr' u64_type 'doubleThunk'];fcns.name{fcnNum}='LMS_SetClockFreq'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', u64_type, 'double'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_LoadConfigSi5351C ( lms_device_t * dev , const char * filename );
-fcns.thunkname{fcnNum}='int32voidPtrcstringThunk';fcns.name{fcnNum}='LMS_LoadConfigSi5351C'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'cstring'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_ConfigureSi5351C ( lms_device_t * dev , float_type clkin , float_type * clks , uint32_t src );
-fcns.thunkname{fcnNum}='int32voidPtrdoublevoidPtruint32Thunk';fcns.name{fcnNum}='LMS_ConfigureSi5351C'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'double', 'doublePtr', 'uint32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_StatusSi5351C ( lms_device_t * dev , uint32_t * status );
-fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_StatusSi5351C'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_ConfigureADF4002 ( lms_device_t * dev , lms_adf4002_conf_t * config );
-fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_ConfigureADF4002'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'lms_adf4002_conf_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_Synchronize ( lms_device_t * dev , _Bool toChip );
+%  int __cdecl LMS_Synchronize ( lms_device_t * dev , _Bool toChip ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolThunk';fcns.name{fcnNum}='LMS_Synchronize'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GPIORead ( lms_device_t * dev , uint8_t * buffer , size_t len );
+%  int __cdecl LMS_GPIORead ( lms_device_t * dev , uint8_t * buffer , size_t len ); 
 fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GPIORead'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8Ptr', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GPIOWrite ( lms_device_t * dev , const uint8_t * buffer , size_t len );
+%  int __cdecl LMS_GPIOWrite ( lms_device_t * dev , const uint8_t * buffer , size_t len ); 
 fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GPIOWrite'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8Ptr', u64_type};fcnNum=fcnNum+1;
-%  int __cdecl LMS_TransferLMS64C ( lms_device_t * dev , int cmd , uint8_t * data , size_t * len );
-fcns.thunkname{fcnNum}='int32voidPtrint32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_TransferLMS64C'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'int32', 'uint8Ptr', 'uint64Ptr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_EnableCalibCache ( lms_device_t * dev , _Bool enable );
+%  int __cdecl LMS_GPIODirRead ( lms_device_t * dev , uint8_t * buffer , size_t len ); 
+fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GPIODirRead'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8Ptr', u64_type};fcnNum=fcnNum+1;
+%  int __cdecl LMS_GPIODirWrite ( lms_device_t * dev , const uint8_t * buffer , size_t len ); 
+fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'Thunk'];fcns.name{fcnNum}='LMS_GPIODirWrite'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint8Ptr', u64_type};fcnNum=fcnNum+1;
+%  int __cdecl LMS_EnableCalibCache ( lms_device_t * dev , _Bool enable ); 
 fcns.thunkname{fcnNum}='int32voidPtr_BoolThunk';fcns.name{fcnNum}='LMS_EnableCalibCache'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetChipTemperature ( lms_device_t * dev , size_t ind , float_type * temp );
+%  int __cdecl LMS_GetChipTemperature ( lms_device_t * dev , size_t ind , float_type * temp ); 
 fcns.thunkname{fcnNum}=['int32voidPtr' u64_type 'voidPtrThunk'];fcns.name{fcnNum}='LMS_GetChipTemperature'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', u64_type, 'doublePtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SetupStream ( lms_device_t * device , lms_stream_t * stream );
+%  int __cdecl LMS_SetupStream ( lms_device_t * device , lms_stream_t * stream ); 
 fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_SetupStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'lms_stream_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_DestroyStream ( lms_device_t * device , lms_stream_t * stream );
+%  int __cdecl LMS_DestroyStream ( lms_device_t * dev , lms_stream_t * stream ); 
 fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_DestroyStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'lms_stream_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_StartStream ( lms_stream_t * stream );
+%  int __cdecl LMS_StartStream ( lms_stream_t * stream ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_StartStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'lms_stream_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_StopStream ( lms_stream_t * conf );
+%  int __cdecl LMS_StopStream ( lms_stream_t * stream ); 
 fcns.thunkname{fcnNum}='int32voidPtrThunk';fcns.name{fcnNum}='LMS_StopStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'lms_stream_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_RecvStream ( lms_stream_t * stream , void * samples , size_t sample_count , lms_stream_meta_t * meta , unsigned timeout_ms );
+%  int __cdecl LMS_RecvStream ( lms_stream_t * stream , void * samples , size_t sample_count , lms_stream_meta_t * meta , unsigned timeout_ms ); 
 fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'voidPtruint32Thunk'];fcns.name{fcnNum}='LMS_RecvStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'lms_stream_tPtr', 'voidPtr', u64_type, 'lms_stream_meta_tPtr', 'uint32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetStreamStatus ( lms_stream_t * stream , lms_stream_status_t * status );
+%  int __cdecl LMS_GetStreamStatus ( lms_stream_t * stream , lms_stream_status_t * status ); 
 fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_GetStreamStatus'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'lms_stream_tPtr', 'lms_stream_status_tPtr'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_SendStream ( lms_stream_t * stream , const void * samples , size_t sample_count , const lms_stream_meta_t * meta , unsigned timeout_ms );
+%  int __cdecl LMS_SendStream ( lms_stream_t * stream , const void * samples , size_t sample_count , const lms_stream_meta_t * meta , unsigned timeout_ms ); 
 fcns.thunkname{fcnNum}=['int32voidPtrvoidPtr' u64_type 'voidPtruint32Thunk'];fcns.name{fcnNum}='LMS_SendStream'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'lms_stream_tPtr', 'voidPtr', u64_type, 'lms_stream_meta_tPtr', 'uint32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_UploadWFM ( lms_device_t * device , const void ** samples , uint8_t chCount , size_t sample_count , int format );
+%  int __cdecl LMS_UploadWFM ( lms_device_t * device , const void ** samples , uint8_t chCount , size_t sample_count , int format ); 
 fcns.thunkname{fcnNum}=['int32voidPtrvoidPtruint8' u64_type 'int32Thunk'];fcns.name{fcnNum}='LMS_UploadWFM'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'voidPtrPtr', 'uint8', u64_type, 'int32'};fcnNum=fcnNum+1;
-%  int __cdecl LMS_EnableTxWFM ( lms_device_t * device , const _Bool active );
-fcns.thunkname{fcnNum}='int32voidPtr_BoolThunk';fcns.name{fcnNum}='LMS_EnableTxWFM'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'bool'};fcnNum=fcnNum+1;
-%  const lms_dev_info_t * __cdecl LMS_GetDeviceInfo ( lms_device_t * device );
+%  int __cdecl LMS_EnableTxWFM ( lms_device_t * device , unsigned chan , _Bool active ); 
+fcns.thunkname{fcnNum}='int32voidPtruint32_BoolThunk';fcns.name{fcnNum}='LMS_EnableTxWFM'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'voidPtr', 'uint32', 'bool'};fcnNum=fcnNum+1;
+%  const lms_dev_info_t * __cdecl LMS_GetDeviceInfo ( lms_device_t * device ); 
 fcns.thunkname{fcnNum}='voidPtrvoidPtrThunk';fcns.name{fcnNum}='LMS_GetDeviceInfo'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='lms_dev_info_tPtr'; fcns.RHS{fcnNum}={'voidPtr'};fcnNum=fcnNum+1;
-%  const char * LMS_GetBuildTimestamp ();
-fcns.thunkname{fcnNum}='cstringThunk';fcns.name{fcnNum}='LMS_GetBuildTimestamp'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='cstring'; fcns.RHS{fcnNum}=[];fcnNum=fcnNum+1;
-%  const char * LMS_GetLibraryVersion ();
+%  const char * LMS_GetLibraryVersion (); 
 fcns.thunkname{fcnNum}='cstringThunk';fcns.name{fcnNum}='LMS_GetLibraryVersion'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='cstring'; fcns.RHS{fcnNum}=[];fcnNum=fcnNum+1;
-%  int __cdecl LMS_GetLastError ( void );
-fcns.thunkname{fcnNum}='int32voidThunk';fcns.name{fcnNum}='LMS_GetLastError'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}=[];fcnNum=fcnNum+1;
-%  const char * __cdecl LMS_GetLastErrorMessage ( void );
+%  const char * __cdecl LMS_GetLastErrorMessage ( void ); 
 fcns.thunkname{fcnNum}='cstringvoidThunk';fcns.name{fcnNum}='LMS_GetLastErrorMessage'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='cstring'; fcns.RHS{fcnNum}=[];fcnNum=fcnNum+1;
 structs.lms_range_t.members=struct('min', 'double', 'max', 'double', 'step', 'double');
-structs.lms_adf4002_conf_t.members=struct('fRef', 'double', 'fVCO', 'double', 'lockDetectPrec', 'uint32', 'antiBacklash', 'uint32', 'referenceCounter', 'uint32', 'cpGain', 'uint32', 'nCounter', 'uint32', 'flCurrent1', 'uint32', 'flCurrent2', 'uint32', 'flTimerCounter', 'uint32', 'flFastlock', 'uint32', 'flMuxCtrl', 'uint32', 'flPDPolarity', 'uint32', 'flPD1', 'uint32', 'flPD2', 'uint32', 'flCounterReset', 'uint32', 'flCPState', 'uint32', 'ilCurrent1', 'uint32', 'ilCurrent2', 'uint32', 'ilTimerCounter', 'uint32', 'ilFastlock', 'uint32', 'ilMuxCtrl', 'uint32', 'ilPDPolarity', 'uint32', 'ilPD1', 'uint32', 'ilPD2', 'uint32', 'ilCounterReset', 'uint32', 'ilCPState', 'uint32', 'flags', 'uint32');
 structs.lms_stream_meta_t.members=struct('timestamp', u64_type, 'waitForTimestamp', 'bool', 'flushPartialPacket', 'bool');
 structs.lms_stream_t.members=struct('handle', u64_type, 'isTx', 'bool', 'channel', 'uint32', 'fifoSize', 'uint32', 'throughputVsLatency', 'single', 'error0', 'voidPtr');
 structs.lms_stream_status_t.members=struct('active', 'bool', 'fifoFilledCount', 'uint32', 'fifoSize', 'uint32', 'underrun', 'uint32', 'overrun', 'uint32', 'droppedPackets', 'uint32', 'sampleRate', 'double', 'linkRate', 'double', 'timestamp', u64_type);
 structs.lms_dev_info_t.members=struct('deviceName', 'int8#32', 'expansionName', 'int8#32', 'firmwareVersion', 'int8#16', 'hardwareVersion', 'int8#16', 'protocolVersion', 'int8#16', 'boardSerialNumber', 'uint32', 'gatewareVersion', 'int8#16', 'gatewareRevision', 'int8#16', 'gatewareTargetBoard', 'int8#32');
 enuminfo.lms_gfir_t=struct('LMS_GFIR1',0,'LMS_GFIR2',1,'LMS_GFIR3',2);
-enuminfo.lms_target_t=struct('LMS_TARGET_RAM',0,'LMS_TARGET_FLASH',1,'LMS_TARGET_BOOT',2);
-enuminfo.lms_loopback_t=struct('LMS_LOOPBACK_NONE',0);
 enuminfo.lms_testsig_t=struct('LMS_TESTSIG_NONE',0,'LMS_TESTSIG_NCODIV8',1,'LMS_TESTSIG_NCODIV4',2,'LMS_TESTSIG_NCODIV8F',3,'LMS_TESTSIG_NCODIV4F',4,'LMS_TESTSIG_DC',5);
+enuminfo.lms_prog_trg_t=struct('LMS_PROG_TRG_FX3',0,'LMS_PROG_TRG_FPGA',1,'LMS_PROG_TRG_MCU',2,'LMS_PROG_TRG_HPM7',3);
+enuminfo.lms_prog_md_t=struct('LMS_PROG_MD_RAM',0,'LMS_PROG_MD_FLASH',1,'LMS_PROG_MD_RST',2);
 methodinfo=fcns;
\ No newline at end of file
diff --git a/limeSDR.m b/limeSDR.m
index d8ec8f1..4e5b6f9 100644
--- a/limeSDR.m
+++ b/limeSDR.m
@@ -242,7 +242,6 @@ function check_status(status)
             obj.info.gatewareTargetBoard=char(dinfo.gatewareTargetBoard);
             
             obj.versions.library_version=char(calllib('libLimeSuite', 'LMS_GetLibraryVersion'));
-            obj.versions.buile_timestamp=char(calllib('libLimeSuite', 'LMS_GetBuildTimestamp'));
             
             obj.rx0 = limeSDR_XCVR(obj, 'RX',0);
             obj.rx1 = limeSDR_XCVR(obj, 'RX',1);